summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <fzs@users.noreply.github.com>2019-11-07 23:55:13 +0100
committerGitHub <noreply@github.com>2019-11-07 23:55:13 +0100
commit4a58ee79389e4fa0c087dba3675b3a9a552024c3 (patch)
treefd883aefc0f9f41b6377556a83d9f914c3065151
parent909d1fd211c1e60c044c1bca81dc4d6a0a622802 (diff)
parent9560f1b308e4386c0538674bbab8ebf3d4dbd812 (diff)
downloadgitblit-4a58ee79389e4fa0c087dba3675b3a9a552024c3.tar.gz
gitblit-4a58ee79389e4fa0c087dba3675b3a9a552024c3.zip
Merge pull request #1266 from pingunaut/1262_java9
Added javax.activation dependency
-rw-r--r--.classpath1
-rw-r--r--build.moxie1
-rw-r--r--gitblit.iml11
3 files changed, 13 insertions, 0 deletions
diff --git a/.classpath b/.classpath
index 42cbfbc8..51de1bc4 100644
--- a/.classpath
+++ b/.classpath
@@ -80,6 +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/javax.activation-1.2.0.jar" sourcepath="ext/src/javax.activation-1.2.0.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" />
diff --git a/build.moxie b/build.moxie
index fd1d82ba..e58b6c6d 100644
--- a/build.moxie
+++ b/build.moxie
@@ -181,6 +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
+- compile 'com.sun.activation:javax.activation:1.2.0'
- test 'junit:junit:4.12'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
diff --git a/gitblit.iml b/gitblit.iml
index 1f4aa248..51945b11 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -824,6 +824,17 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="javax.activation-1.2.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/javax.activation-1.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/javax.activation-1.2.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="junit-4.12.jar">
<CLASSES>