UPSE-293: Updates to support Java 11

uPortal-Project · Jan 9, 2023 · 9aabc68 · 9aabc68
1 parent 894f629
commit 9aabc68
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,6 +57,8 @@
         <project.build.targetVersion>1.8</project.build.targetVersion>
 
         <jaxb2basicsVersion>0.12.0</jaxb2basicsVersion>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
+        <jaxb-impl.version>2.3.3</jaxb-impl.version>
         <springVersion>5.3.15</springVersion>
     </properties>
 
@@ -65,7 +67,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.4.4</version>
+		<version>1.2.11</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
@@ -114,6 +116,16 @@
                 <version>3.1.0</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb-impl.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

diff --git a/resource-server-api/pom.xml b/resource-server-api/pom.xml
@@ -55,6 +55,14 @@
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>jaxb2-basics-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -119,6 +127,11 @@
                         <artifactId>jaxb-xjc</artifactId>
                         <version>2.2.6</version>
                     </dependency>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
+                        <version>1.2.0</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>

diff --git a/resource-server-webapp/pom.xml b/resource-server-webapp/pom.xml
@@ -44,6 +44,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+                <jaxb-api.version>2.3.1</jaxb-api.version>
+                <jaxb-impl.version>2.3.3</jaxb-impl.version>
 	</properties>
 
 	<distributionManagement>
@@ -89,6 +91,16 @@
 			<artifactId>resource-server-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxb-api.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb-impl.version}</version>
+		</dependency>
         <!--
          | Allows resources in webjars to be included without their version numbers;
          | see https://www.webjars.org/documentation#springboot
@@ -158,7 +170,7 @@
 				<executions>
 					<execution>
 						<id>sign-artifacts</id>
-						<phase>verify</phase>
+						<phase>deploy</phase>
 						<goals>
 							<goal>sign</goal>
 						</goals>

diff --git a/resource-server-webapp/src/main/resources/logback.xml b/resource-server-webapp/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
 <!--    http://www.qos.ch/shop/products/professionalSupport         -->
 <!--                                                                -->
 <configuration scan="true" scanPeriod="30 seconds">
-  <contextName>ResourceServingWebapp</contextName>
+  <contextName>resource-server</contextName>
 
   <!-- 
    | Propagate log levels to java.util.logging