summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <florian.zschocke@devolo.de>2016-12-21 22:02:46 +0100
committerFlorian Zschocke <florian.zschocke@devolo.de>2016-12-21 22:02:46 +0100
commit23072ffb51710d0c850adaa2bac241f3d91c390b (patch)
tree9f3c63a9a3c03dfd1fb065b6e3e21783573bcf6a
parent99b4a1898f0c3533062263cda18b456f099ee2cf (diff)
downloadgitblit-23072ffb51710d0c850adaa2bac241f3d91c390b.tar.gz
gitblit-23072ffb51710d0c850adaa2bac241f3d91c390b.zip
Update to explicit versions of JUnit 4.12 and JaCoCo 0.7.8
Use explicit coordinates, and therefor version numbers fro JUnit in the build.moxie file. It should not be some version that just happens to be used. Update JUnit to latest 4.12. Update JaCoCo to lates 0.7.8, which makes it work under Java 8. The last used version would fail when tests are run under Java 8.
-rw-r--r--.classpath2
-rw-r--r--build.moxie4
-rw-r--r--gitblit.iml6
3 files changed, 6 insertions, 6 deletions
diff --git a/.classpath b/.classpath
index 0f7c09a7..095cb036 100644
--- a/.classpath
+++ b/.classpath
@@ -80,7 +80,7 @@
<classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar" />
<classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar" />
<classpathentry kind="lib" path="ext/jsoup-1.7.3.jar" sourcepath="ext/src/jsoup-1.7.3.jar" />
- <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
+ <classpathentry kind="lib" path="ext/junit-4.12.jar" sourcepath="ext/src/junit-4.12.jar" />
<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
<classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
<classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" />
diff --git a/build.moxie b/build.moxie
index 5cb08b68..07208cc3 100644
--- a/build.moxie
+++ b/build.moxie
@@ -181,7 +181,7 @@ dependencies:
- compile 'ro.fortsoft.pf4j:pf4j:0.9.0' :war
- compile 'org.apache.tika:tika-core:1.5' :war
- compile 'org.jsoup:jsoup:1.7.3' :war
-- test 'junit'
+- test 'junit:junit:4.12'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
- test 'org.seleniumhq.selenium:selenium-support:${selenium.version}' @jar
@@ -189,4 +189,4 @@ dependencies:
- test 'org.mockito:mockito-core:1.10.19'
# Dependencies with the "build" scope are retrieved
# and injected into the Ant runtime classpath
-- build 'jacoco'
+- build 'org.jacoco:org.jacoco.ant:0.7.8'
diff --git a/gitblit.iml b/gitblit.iml
index 163491bc..71907a59 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -823,13 +823,13 @@
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
- <library name="junit-4.11.jar">
+ <library name="junit-4.12.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/junit-4.11.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/junit-4.11.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/junit-4.12.jar!/" />
</SOURCES>
</library>
</orderEntry>