Merge pull request #2828 from ilittle-cnri/master

[DS-4205] Bump Handle to version 9.3.0-SNAPSHOT
DSpace · Jul 21, 2020 · 15d2e16 · 15d2e16
2 parents 6b3bd4d + 216bd16
commit 15d2e16
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 9 deletions.
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
@@ -291,9 +291,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.dspace</groupId>
+            <groupId>net.handle</groupId>
             <artifactId>handle</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.cnri</groupId>
+            <artifactId>cnri-servlet-container</artifactId>
+            <exclusions>
+                <!-- Newer versions provided in our parent POM -->
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- Jetty is needed to run Handle Server -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -471,11 +482,59 @@
             <artifactId>solr-cell</artifactId>
             <version>${solr.client.version}</version>
             <exclusions>
-                <!-- Newer version provided in our parent POM -->
+                <!-- Newer versions provided in our parent POM -->
                 <exclusion>
                     <groupId>org.ow2.asm</groupId>
                     <artifactId>asm-commons</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-xml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-webapp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-deploy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-continuation</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlets</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-security</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
@@ -460,6 +460,14 @@
             <artifactId>solr-cell</artifactId>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-continuation</artifactId>

diff --git a/dspace/config/log4j-handle-plugin.properties b/dspace/config/log4j-handle-plugin.properties
@@ -20,12 +20,12 @@ log.dir=${dspace.dir}/log
 log4j.rootCategory=INFO, A1
 
 # A1 is set to be a DailyRollingFileAppender.
-log4j.appender.A1=org.apache.logging.log4j.DailyRollingFileAppender
+log4j.appender.A1=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.A1.File=${log.dir}/handle-plugin.log
 log4j.appender.A1.DatePattern='.'yyyy-MM-dd
 
 # A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%d %-5p %c @ %m%n
 
 

diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
@@ -266,6 +266,14 @@ just adding new jar in the classloader</description>
             <artifactId>solr-cell</artifactId>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-continuation</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -35,8 +35,8 @@
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
-        <!-- NOTE: Jetty needed for Handle Server & tests. Should be synced with version provided by solr-cell -->
-        <jetty.version>9.4.8.v20171121</jetty.version>
+        <!-- NOTE: Jetty needed for Handle Server & tests -->
+        <jetty.version>9.4.15.v20190215</jetty.version>
         <log4j.version>2.11.2</log4j.version>
         <pdfbox-version>2.0.15</pdfbox-version>
         <poi-version>3.17</poi-version>
@@ -1236,9 +1236,15 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.dspace</groupId>
+                <groupId>net.handle</groupId>
                 <artifactId>handle</artifactId>
-                <version>9.1.0.v20190416</version>
+                <version>9.3.0-SNAPSHOT</version>
+            </dependency>
+            <!-- Required to run Handle Server -->
+            <dependency>
+                <groupId>net.cnri</groupId>
+                <artifactId>cnri-servlet-container</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <!-- Jetty is needed to run Handle Server (and tests in some modules) -->
             <dependency>
@@ -1590,7 +1596,7 @@
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.6.1</version>
+                <version>2.8.6</version>
                 <scope>compile</scope>
             </dependency>
             <!-- Google Analytics -->
@@ -1842,6 +1848,11 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <!-- For Handle Server -->
+        <repository>
+            <id>handle.net</id>
+            <url>https://handle.net/maven</url>
+        </repository>
         <!-- For Solr 7.x, as the solr-parent POM has an old URL for this maven-restlet repository.
              The URL is corrected (to the below value) as of Solr 8.3.x, but has not yet been backported to 7.x.
              Once we upgrade to Solr 8+, we should be able to remove this repository. -->