Upgraded to java 11 (#539)

* Upgraded to java 11 * Changed ddf-jsonrpc version to latest released * Upgraded to release version of DDF Co-authored-by: Shaun Morris <[email protected]>
codice · Nov 6, 2024 · ad90f42 · ad90f42
1 parent e7de49c
commit ad90f42
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 66 deletions.
diff --git a/pom.xml b/pom.xml
@@ -46,19 +46,26 @@
   <properties>
     <!--Project properties-->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <compiler.fork>false</compiler.fork>
-    <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
+    <maven.bundle.plugin.version>4.2.1</maven.bundle.plugin.version>
+    <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+    <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
+    <maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>
     <maven.release.plugin.version>3.0.0-M1</maven.release.plugin.version>
+    <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
+    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
     <javalin.thirdparty.bundle.version>3.11.2_1</javalin.thirdparty.bundle.version>
     <kotlin-osgi.version>1.3.71</kotlin-osgi.version>
-    <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-    <errorprone.version>2.2.0</errorprone.version>
+    <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+    <errorprone.version>2.4.0</errorprone.version>
+    <jacoco.maven.plugin.version>0.8.6</jacoco.maven.plugin.version>
+    <fmt.maven.plugin.version>2.3.0</fmt.maven.plugin.version>
 
     <!--Backend properties-->
-    <ddf.version>2.26.47</ddf.version>
-    <ddf-jsonrpc.version>0.6</ddf-jsonrpc.version>
+    <ddf.version>2.27.0</ddf.version>
+    <ddf-jsonrpc.version>0.7</ddf-jsonrpc.version>
     <ddf.support.version>2.3.16</ddf.support.version>
     <antlr.version>4.3</antlr.version>
     <c3p0.version>0.9.5.5</c3p0.version>
@@ -89,6 +96,7 @@
     <pac4j.version>4.0.1</pac4j.version>
     <pax.web.jsp.version>7.2.18</pax.web.jsp.version>
     <quartz.version>2.3.2</quartz.version>
+    <restassured.version>3.3.0</restassured.version>
     <spark.version>2.9.2</spark.version>
     <spatial4j.version>0.7</spatial4j.version>
     <tika.version>1.24.1</tika.version>
@@ -103,7 +111,7 @@
     <hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
     <hamcrest-all.version>1.3</hamcrest-all.version>
     <junit.version>4.12</junit.version>
-    <mockito.version>2.8.47</mockito.version>
+    <mockito.version>3.6.28</mockito.version>
     <objenesis.version>2.6</objenesis.version>
     <xmlunit.version>1.4</xmlunit.version>
 
@@ -172,42 +180,37 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>${maven.resources.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>${maven.compiler.plugin.version}</version>
           <configuration>
-            <compilerId>javac-with-errorprone</compilerId>
-            <forceJavacCompilerUse>true</forceJavacCompilerUse>
-            <!-- maven-compiler-plugin defaults to targeting Java 5, but our javac
-                    only supports >=6 -->
-            <source>8</source>
-            <target>8</target>
-            <maxmem>512M</maxmem>
+            <source>${maven.compiler.source}</source>
+            <target>${maven.compiler.target}</target>
+            <maxmem>512k</maxmem>
             <fork>${compiler.fork}</fork>
             <encoding>${project.build.sourceEncoding}</encoding>
+            <compilerArgs>
+              <arg>-XDcompilePolicy=simple</arg>
+              <arg>-Xplugin:ErrorProne</arg>
+              <arg>--add-exports</arg>
+              <arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
+            </compilerArgs>
+            <annotationProcessorPaths>
+              <path>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_core</artifactId>
+                <version>${errorprone.version}</version>
+              </path>
+            </annotationProcessorPaths>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.codehaus.plexus</groupId>
-              <artifactId>plexus-compiler-javac-errorprone</artifactId>
-              <version>2.8.2</version>
-            </dependency>
-            <!-- override plexus-compiler-javac-errorprone's dependency on
-                 Error Prone with the latest version -->
-            <dependency>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.1.2</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>4.2.1</version>
+          <version>${maven.bundle.plugin.version}</version>
           <extensions>true</extensions>
           <configuration>
             <!-- Disabled OBR to increase build speed -->
@@ -220,7 +223,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>${maven.surefire.plugin.version}</version>
           <configuration>
             <argLine>@{argLine} -Djava.awt.headless=true -noverify</argLine>
             <includes>
@@ -233,7 +236,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
+          <version>${maven.enforcer.plugin.version}</version>
           <dependencies>
             <dependency>
               <groupId>ddf.support</groupId>
@@ -259,7 +262,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.10</version>
+          <version>${jacoco.maven.plugin.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.codice.maven</groupId>
@@ -326,7 +329,7 @@
       <plugin>
         <groupId>com.coveo</groupId>
         <artifactId>fmt-maven-plugin</artifactId>
-        <version>2.3.0</version>
+        <version>${fmt.maven.plugin.version}</version>
         <!--        <version>2.9</version>-->
         <executions>
           <execution>

diff --git a/ui-backend/catalog-ui-search/pom.xml b/ui-backend/catalog-ui-search/pom.xml
@@ -347,12 +347,6 @@
             <artifactId>catalog-core-commands</artifactId>
             <version>${ddf.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ddf.thirdparty</groupId>
-            <artifactId>rest-assured</artifactId>
-            <version>${ddf.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
             <artifactId>owasp-java-html-sanitizer</artifactId>
@@ -394,6 +388,11 @@
             <artifactId>preferences-api</artifactId>
             <version>${ddf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>${restassured.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...og-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java b/...og-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java
@@ -952,7 +952,7 @@ public Boolean getUnknownErrorBoxEnabled() {
 
   public void setTypeNameMapping(String[] mappings) {
     if (mappings != null) {
-      typeNameMapping = MapUtils.lazyMap(new TreeMap(), NEW_SET_FACTORY);
+      typeNameMapping = MapUtils.lazyMap(new TreeMap<String, Set<String>>(), NEW_SET_FACTORY);
 
       for (String mappingValue : mappings) {
         // workaround for KARAF-1701

diff --git a/...alog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java b/...alog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java
@@ -67,12 +67,9 @@ public String getOperator() {
 
   @Override
   public List<FilterNode> getChildren() {
-    return Stream.of(json.get(CHILDREN))
-        .map(List.class::cast)
-        .flatMap(List::stream)
-        .map(Map.class::cast)
-        .map(FilterNodeMapImpl::new)
-        .collect(Collectors.toList());
+    List<Object> filters = (List<Object>) json.get(CHILDREN);
+    Stream<Object> streams = Stream.of(filters).flatMap(List::stream);
+    return streams.map(Map.class::cast).map(FilterNodeMapImpl::new).collect(Collectors.toList());
   }
 
   @Override

diff --git a/...i-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java b/...i-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java
@@ -108,15 +108,14 @@ public void testSetTerrainProvider() throws Exception {
   public void testContentTypeMappings() throws Exception {
     // Setup
     configurationApplication.setTypeNameMapping(
-        (String[])
-            Arrays.asList(
-                    "foo=bar,foo=baz",
-                    "foo=qux",
-                    "alpha=beta, alpha = omega ",
-                    "=,=,",
-                    "bad,input",
-                    "name=,=type")
-                .toArray());
+        Arrays.asList(
+                "foo=bar,foo=baz",
+                "foo=qux",
+                "alpha=beta, alpha = omega ",
+                "=,=,",
+                "bad,input",
+                "name=,=type")
+            .toArray(String[]::new));
 
     // Verify
     assertThat(configurationApplication.getTypeNameMapping().size(), is(2));

diff --git a/...catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java b/...catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java
@@ -24,8 +24,6 @@
 import static spark.Spark.stop;
 
 import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Header;
 import ddf.catalog.CatalogFramework;
 import ddf.catalog.data.AttributeRegistry;
 import ddf.catalog.data.Metacard;
@@ -45,6 +43,8 @@
 import ddf.catalog.source.SourceUnavailableException;
 import ddf.catalog.source.UnsupportedQueryException;
 import ddf.security.Subject;
+import io.restassured.RestAssured;
+import io.restassured.http.Header;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/...search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java b/...search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.mock;
 import static spark.Spark.stop;
 
-import com.jayway.restassured.RestAssured;
 import ddf.catalog.CatalogFramework;
 import ddf.catalog.data.Result;
 import ddf.catalog.data.impl.MetacardImpl;
@@ -40,6 +39,7 @@
 import ddf.catalog.operation.impl.UpdateRequestImpl;
 import ddf.catalog.operation.impl.UpdateResponseImpl;
 import ddf.security.SubjectIdentity;
+import io.restassured.RestAssured;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ServerSocket;

diff --git a/...earch/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java b/...earch/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java
@@ -88,7 +88,7 @@ public class CqlTransformHandlerTest {
   private static final String SERVICE_NOT_FOUND = "\"Service not found\"";
   private static final String SERVICE_SUCCESS = GSON.toJson("");
   private static final String ATTACHMENT_REGEX =
-      "^attachment;filename=\"export-\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z."
+      "^attachment;filename=\"export-\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.(\\d{3}){1,2})?Z."
           + RETURN_ID
           + "\"$";
 

diff --git a/ui-frontend/yarn.lock b/ui-frontend/yarn.lock
@@ -4501,10 +4501,30 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
-  version "1.0.30001473"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz#3859898b3cab65fc8905bb923df36ad35058153c"
-  integrity sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==
+can-use-dom@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
+  integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30001116"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001116.tgz#77635640080024292f9f239042e7d1acd5cb88a7"
+  integrity sha512-v7zj0MenYwLid3ENDLNlTMBOoIQdWYcShqnXbZZuuaq11xnn2y9DfL5VtZhiIb9PInT3sWpP11GVjmC8hPFBcA==
+
+caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111:
+  version "1.0.30001116"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz#f3a3dea347f9294a3bdc4292309039cc84117fb8"
+  integrity sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"