From: Florian Zschocke <zschocke@gmx.de>
Date: Thu, 7 Nov 2019 14:28:21 +0000 (+0100)
Subject: Update to recommended com.sun.activation package.
X-Git-Tag: r1.9.0~29^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9560f1b308e4386c0538674bbab8ebf3d4dbd812;p=gitblit.git

Update to recommended com.sun.activation package.

Update the dependency to the recommended JAF stand-alone
com.sun.activation:javax.activation:1.2.0
---

diff --git a/.classpath b/.classpath
index c66b3856..51de1bc4 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/javax.activation-api-1.2.0.jar" sourcepath="ext/src/javax.activation-api-1.2.0.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 fd6471eb..2c030e25 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
-- compile 'javax.activation:javax.activation-api:1.2.0'
+- 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 0c059a5e..51945b11 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -825,13 +825,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="javax.activation-api-1.2.0.jar">
+      <library name="javax.activation-1.2.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/javax.activation-api-1.2.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/javax.activation-1.2.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/javax.activation-api-1.2.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/javax.activation-1.2.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>