Commit Graph

237 Commits

Author SHA1 Message Date
Sebastian Sdorra
17706161ba Use Java 11 for build but 8 as target platform 2021-01-14 12:01:33 +01:00
Sebastian Sdorra
8c27af2661 Remove maven build related files 2021-01-14 12:01:30 +01:00
Sebastian Sdorra
3a4a5a9d10 Migrate scm-it module to gradle 2021-01-14 11:55:28 +01:00
CES Marvin
374d085fdd prepare for next development iteration 2020-12-17 15:24:34 +00:00
CES Marvin
38a7ff6acb release version 2.12.0 2020-12-17 14:55:08 +00:00
CES Marvin
56c63cb5b7 prepare for next development iteration 2020-12-07 15:01:20 +00:00
CES Marvin
baf04a551c release version 2.11.1 2020-12-07 14:24:49 +00:00
CES Marvin
87d06a708b prepare for next development iteration 2020-12-04 08:10:20 +00:00
CES Marvin
df62ffbe16 release version 2.11.0 2020-12-04 07:27:13 +00:00
Konstantin Schaper
8986e3d378 Merge branch 'develop' into feature/manage-tags
# Conflicts:
#	scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
2020-11-30 14:18:05 +01:00
Konstantin Schaper
11ebba349c fix integration test 2020-11-27 13:08:42 +01:00
CES Marvin
4752fdeea1 prepare for next development iteration 2020-11-24 18:59:15 +00:00
CES Marvin
b283f782ab release version 2.10.1 2020-11-24 18:22:43 +00:00
CES Marvin
9baa1f930b prepare for next development iteration 2020-11-20 10:22:37 +00:00
CES Marvin
a4d0771f6f release version 2.10.0 2020-11-20 09:36:03 +00:00
CES Marvin
59e28ec313 prepare for next development iteration 2020-11-11 17:48:56 +00:00
CES Marvin
bc4c2df27c release version 2.9.1 2020-11-11 17:15:36 +00:00
CES Marvin
9930d82d32 prepare for next development iteration 2020-11-06 08:40:11 +00:00
CES Marvin
ea6e24c212 release version 2.9.0 2020-11-06 08:05:48 +00:00
Konstantin Schaper
a6667b0ffd update integration test 2020-11-04 10:00:28 +01:00
René Pfeuffer
8f13f3203d Fix integration test 2020-10-30 14:24:31 +01:00
CES Marvin
520db79a38 prepare for next development iteration 2020-10-27 08:35:13 +00:00
CES Marvin
1db75f4cf3 release version 2.8.0 2020-10-27 08:00:25 +00:00
CES Marvin
bb9f1adc52 prepare for next development iteration 2020-10-14 12:38:13 +00:00
CES Marvin
eb126a5bbe release version 2.7.1 2020-10-14 12:03:24 +00:00
CES Marvin
befd50eeef prepare for next development iteration 2020-10-12 13:26:08 +00:00
CES Marvin
abe8413802 release version 2.7.0 2020-10-12 12:41:15 +00:00
René Pfeuffer
4200aa1225 Add integration test for api keys 2020-10-05 10:53:30 +02:00
CES Marvin
bc7d4ed9f6 prepare for next development iteration 2020-09-30 08:15:47 +00:00
CES Marvin
5887c5c268 release version 2.6.1 2020-09-30 07:32:54 +00:00
CES Marvin
4e7d62ce2f prepare for next development iteration 2020-09-25 10:05:04 +00:00
CES Marvin
e2f8566a8b release version 2.6.0 2020-09-25 09:25:13 +00:00
CES Marvin
93f240e087 prepare for next development iteration 2020-09-11 06:21:29 +00:00
CES Marvin
fab108c3b7 release version 2.5.0 2020-09-11 05:46:15 +00:00
René Pfeuffer
af9e2529ca Adapt test to additional 'date' attribute in tag object 2020-09-03 14:26:58 +02:00
CES Marvin
a66ae32b61 prepare for next development iteration 2020-09-01 14:26:34 +00:00
CES Marvin
6913f642a1 release version 2.4.1 2020-09-01 13:52:15 +00:00
Sebastian Sdorra
d6a5c54aba Create junit reports for cypress test and do not fail the build 2020-08-25 11:17:05 +02:00
Sebastian Sdorra
1a885b64c6 Execute e2e tests as part of scm-it 2020-08-25 08:44:38 +02:00
CES Marvin
c7309d8962 prepare for next development iteration 2020-08-14 08:51:55 +00:00
CES Marvin
81bfddd141 release version 2.4.0 2020-08-14 08:15:36 +00:00
Eduard Heimbuch
a9bf3c54e6 merge with develop 2020-08-10 11:39:18 +02:00
René Pfeuffer
264ad2bef1 Migrate to JUnit 5 2020-08-07 17:25:23 +02:00
René Pfeuffer
fa560f9913 Use target dir of root pom
It looks like the variable scm.home is bound differently for the
dependency plugin and the jetty plugin, when scm-webapp was build
beforehand.
2020-08-07 09:55:26 +02:00
René Pfeuffer
2433c50d64 Add test for "real" merge commits 2020-08-07 08:01:13 +02:00
René Pfeuffer
e814694314 Fix scm home folder for integration tests
This variable should be absolute, because otherwise this may resolve
to different directories. For instance the web server resolves the
relative path to the root of the parent pom, while the dependency
plugin resolves it to the path of the scm-it pom. This led to the
error, that the scm-integration-test-plugin was not copied to the
correct plugin directory and therefore was not installed by the test
scm server.
2020-08-07 07:44:01 +02:00
René Pfeuffer
6f20781812 Add first integration tests for merge detection 2020-08-06 17:12:14 +02:00
CES Marvin
7352bdf55b prepare for next development iteration 2020-08-04 14:29:12 +00:00
CES Marvin
0394f8fd96 release version 2.3.1 2020-08-04 13:57:22 +00:00
Eduard Heimbuch
7dc13b1168 add integration tests 2020-08-04 13:31:37 +02:00