diff --git a/pom.xml b/pom.xml index 95f9e7cea2a..4e26b4baf12 100644 --- a/pom.xml +++ b/pom.xml @@ -46,19 +46,26 @@ UTF-8 - 1.8 - 1.8 + 11 + 11 false - 2.8.2 + 4.2.1 + 3.8.1 + 3.0.0-M1 + 3.0.0-M3 3.0.0-M1 + 3.2.0 + 3.0.0-M5 3.11.2_1 1.3.71 - 3.0.2 - 2.2.0 + 3.2.0 + 2.4.0 + 0.8.6 + 2.3.0 - 2.26.47 - 0.6 + 2.27.0 + 0.7 2.3.16 4.3 0.9.5.5 @@ -89,6 +96,7 @@ 4.0.1 7.2.18 2.3.2 + 3.3.0 2.9.2 0.7 1.24.1 @@ -103,7 +111,7 @@ 2.0.0.0 1.3 4.12 - 2.8.47 + 3.6.28 2.6 1.4 @@ -172,42 +180,37 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 + ${maven.resources.plugin.version} org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven.compiler.plugin.version} - javac-with-errorprone - true - - 8 - 8 - 512M + ${maven.compiler.source} + ${maven.compiler.target} + 512k ${compiler.fork} ${project.build.sourceEncoding} + + -XDcompilePolicy=simple + -Xplugin:ErrorProne + --add-exports + java.base/sun.security.x509=ALL-UNNAMED + + + + com.google.errorprone + error_prone_core + ${errorprone.version} + + - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.8.2 - - - - com.google.errorprone - error_prone_core - 2.1.2 - - org.apache.felix maven-bundle-plugin - 4.2.1 + ${maven.bundle.plugin.version} true @@ -220,7 +223,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + ${maven.surefire.plugin.version} @{argLine} -Djava.awt.headless=true -noverify @@ -233,7 +236,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + ${maven.enforcer.plugin.version} ddf.support @@ -259,7 +262,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + ${jacoco.maven.plugin.version} org.codice.maven @@ -326,7 +329,7 @@ com.coveo fmt-maven-plugin - 2.3.0 + ${fmt.maven.plugin.version} diff --git a/ui-backend/catalog-ui-search/pom.xml b/ui-backend/catalog-ui-search/pom.xml index 68b543f02ab..20bba41e84f 100644 --- a/ui-backend/catalog-ui-search/pom.xml +++ b/ui-backend/catalog-ui-search/pom.xml @@ -347,12 +347,6 @@ catalog-core-commands ${ddf.version} - - ddf.thirdparty - rest-assured - ${ddf.version} - test - com.googlecode.owasp-java-html-sanitizer owasp-java-html-sanitizer @@ -394,6 +388,11 @@ preferences-api ${ddf.version} + + io.rest-assured + rest-assured + ${restassured.version} + diff --git a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java b/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java index d2c3ba535e1..439b030e8f2 100644 --- a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java +++ b/ui-backend/catalog-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>(), NEW_SET_FACTORY); for (String mappingValue : mappings) { // workaround for KARAF-1701 diff --git a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java b/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java index 404642ea279..aaacf732dc0 100644 --- a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java +++ b/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java @@ -67,12 +67,9 @@ public String getOperator() { @Override public List 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 filters = (List) json.get(CHILDREN); + Stream streams = Stream.of(filters).flatMap(List::stream); + return streams.map(Map.class::cast).map(FilterNodeMapImpl::new).collect(Collectors.toList()); } @Override diff --git a/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java b/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java index 65429cf9fa2..f28e6cc69a9 100644 --- a/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java +++ b/ui-backend/catalog-ui-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/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java b/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java index fa6e6095e55..811ebebd17d 100644 --- a/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java +++ b/ui-backend/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/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java b/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java index 6a0840e181f..5b85d6686d0 100644 --- a/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java +++ b/ui-backend/catalog-ui-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/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java b/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java index a2c88f17f5c..fd428c35426 100644 --- a/ui-backend/catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java +++ b/ui-backend/catalog-ui-search/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 index c2f6f8bf715..d6d75d3f17c 100644 --- 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"