From 76bbc2df97ed987d1d6bf8ce2c160ad1db7f7033 Mon Sep 17 00:00:00 2001
From: Martin Spielmann <mail@martinspielmann.de>
Date: Fri, 3 Nov 2017 22:43:34 +0100
Subject: Added javax.activation dependency " thanks to this dependency, one
 can start gitblit with java 9 without using deprecated internal module
 --add-modules java.activation

---
 .classpath  |  1 +
 build.moxie |  1 +
 gitblit.iml | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/.classpath b/.classpath
index 42cbfbc8..c66b3856 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-api-1.2.0.jar" sourcepath="ext/src/javax.activation-api-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 f21241d1..fd6471eb 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 'javax.activation:javax.activation-api: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..0c059a5e 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -824,6 +824,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="javax.activation-api-1.2.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/javax.activation-api-1.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/javax.activation-api-1.2.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library name="junit-4.12.jar">
         <CLASSES>
-- 
cgit v1.2.3


From 9560f1b308e4386c0538674bbab8ebf3d4dbd812 Mon Sep 17 00:00:00 2001
From: Florian Zschocke <zschocke@gmx.de>
Date: Thu, 7 Nov 2019 15:28:21 +0100
Subject: Update to recommended com.sun.activation package.

Update the dependency to the recommended JAF stand-alone
com.sun.activation:javax.activation:1.2.0
---
 .classpath  | 2 +-
 build.moxie | 2 +-
 gitblit.iml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

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>
-- 
cgit v1.2.3