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
CES Marvin
17da0b9a8a
prepare for next development iteration
2020-07-23 12:17:00 +00:00
CES Marvin
efda158d76
release version 2.3.0
2020-07-23 11:43:35 +00:00
CES Marvin
4279573633
prepare for next development iteration
2020-07-03 10:04:14 +00:00
CES Marvin
fcc4fd0960
release version 2.2.0
2020-07-03 09:33:30 +00:00
Sebastian Sdorra
081e6f5185
relax test pattern to not fail if there are no millis on the creation date
2020-07-03 11:08:43 +02:00
CES Marvin
c5f2502e6f
prepare for next development iteration
2020-06-23 16:22:47 +00:00
CES Marvin
e5c7b4eda4
release version 2.1.1
2020-06-23 15:34:23 +00:00
CES Marvin
22881dd381
prepare for next development iteration
2020-06-18 11:31:16 +00:00
CES Marvin
b037053ec5
release version 2.1.0
2020-06-18 10:54:38 +00:00
CES Marvin
a3e4c1ddf4
prepare for next development iteration
2020-06-04 09:41:11 +00:00
CES Marvin
4ae098e3b6
release version 2.0.0
2020-06-04 09:03:17 +00:00
René Pfeuffer
7636f1e845
Remove temp dir extension and use native junit annotation
2020-05-24 16:05:20 +02:00
René Pfeuffer
b12b1ca5fe
Update rest assured version
2020-05-19 21:57:55 +02:00
René Pfeuffer
d62f5dde18
Fix version
2020-05-11 14:25:18 +02:00
CES Marvin
52a8f0e9ca
prepare for next development iteration
2020-05-08 09:19:12 +00:00
CES Marvin
1d80b043c7
release version 2.0.0-rc8
2020-05-08 08:49:02 +00:00
René Pfeuffer
c4fc0615b5
Set version back to 2.0.0-SNAPSHOT
2020-04-09 21:08:58 +02:00
CES Marvin
d5847e7965
prepare for next development iteration
2020-04-09 19:03:13 +00:00
CES Marvin
3cf675f30d
release version 2.0.0-rc7
2020-04-09 18:37:13 +00:00
René Pfeuffer
41d02b9c24
Set version back to 2.0.0-SNAPSHOT
2020-03-26 18:52:11 +01:00
CES Marvin
263072d68b
prepare for next development iteration
2020-03-26 15:59:09 +00:00
CES Marvin
d94a2d9b7f
release version 2.0.0-rc6
2020-03-26 15:23:24 +00:00
Florian Scholdei
f1b34eb502
Changeover to MIT license ( #1066 )
...
* prepare license-maven-plugin for license migration
* added license mapping for tsx files and added some more excludes
* Changeover to MIT license
* Fix build problems
* Delete old remaining licenses
* Add more exclude path for license checker
* Rename included netbeans license, add exclude .m2/repository/
* Specify .m2 exclude because not only repository/, also wrapper/ must match
* Add .cache/ exclude for license check
* Modify formatting of license in java classes to comply with convention and IDE
* Add IntelliJ documentation for license configuration
* Update CHANGELOG.md
* Exclude tmp/workspace/ dir for license check
* Edit README.md
Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com >
2020-03-23 15:35:58 +01:00
René Pfeuffer
0ded668cc8
Merge remote-tracking branch 'origin/develop' into feature/speed_up_ci
2020-03-20 09:46:23 +01:00
snyk-bot
5c9a03a384
fix: upgrade org.glassfish:javax.json from 1.0.4 to 1.1.4
...
Snyk has created this PR to upgrade org.glassfish:javax.json from 1.0.4 to 1.1.4.
See this package in NPM:
https://www.npmjs.com/package/org.glassfish:javax.json
See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/19b9a56b-d5b5-4d36-a7e8-665c853bc716?utm_source=github&utm_medium=upgrade-pr
2020-03-19 02:37:59 +00:00
Sebastian Sdorra
9a18a1c201
merge with develop branch
2020-03-13 08:06:34 +01:00
Sebastian Sdorra
7f24fc8c9c
prepare for next development iteration
2020-03-13 07:32:02 +01:00
CES Marvin
cabefa72fb
release version 2.0.0-rc5
2020-03-12 21:11:54 +00:00
Sebastian Sdorra
7997b4e880
create empty war file for scm-it
2020-03-11 12:42:02 +01:00
Sebastian Sdorra
52fb900cf3
reduce logging of scm-it test instance
2020-03-04 12:56:38 +01:00
Rene Pfeuffer
d513ebcd83
Prepare for next development iteration
2020-02-14 13:40:39 +01:00
Rene Pfeuffer
476dcc5758
Release version 2.0.0-rc4
2020-02-14 12:28:11 +01:00
Sebastian Sdorra
71c5f68878
implemented simple ClassLoaderLifeCycle to fix integration tests on Java > 8
2020-02-04 15:59:11 +01:00
Sebastian Sdorra
c20a50e9ec
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
Rene Pfeuffer
a7ff141986
Release version 2.0.0-rc3
2020-01-31 13:02:27 +01:00
Sebastian Sdorra
646b008af3
Prepare for next development iteration
2020-01-29 16:01:25 +01:00
Sebastian Sdorra
28040d0c65
release version 2.0.0-rc2
2020-01-29 15:22:54 +01:00
Rene Pfeuffer
516bbe6f26
Prepare for next development iteration
2019-12-02 15:15:34 +01:00
Rene Pfeuffer
2d08ba4adc
Release version 2.0.0-rc1
2019-12-02 12:52:33 +01:00
Rene Pfeuffer
3a3c27bb67
Enhance logging for diff comparison
2019-11-19 09:26:01 +01:00
Rene Pfeuffer
20338c1bb6
Add integration tests for anonymous access
2019-10-17 11:53:23 +02:00
Rene Pfeuffer
3e2c8b7c4b
Remove archive flag
2019-08-20 14:23:52 +02:00
Eduard Heimbuch
e33b4dc9fc
removed unused method
2019-08-02 14:46:58 +02:00
