Skip to content

Commit

Permalink
Merge 16042dc into e7de49c
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexabird
alexabird authored Nov 6, 2024
2 parents e7de49c + 16042dc commit 2852b0e
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 74 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pipeline {
}
}
steps{
withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
withMaven(maven: 'maven-latest', jdk: 'jdk21', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
sh 'mvn deploy -B -DskipStatic=true -DskipTests=true -DretryFailedDeploymentCount=10 $DISABLE_DOWNLOAD_PROGRESS_OPTS'
}
}
Expand Down
80 changes: 42 additions & 38 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,27 @@
<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>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<compiler.fork>false</compiler.fork>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
<maven.release.plugin.version>3.0.0-M1</maven.release.plugin.version>
<maven.bundle.plugin.version>5.1.4</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.5.0</maven.enforcer.plugin.version>
<maven.release.plugin.version>3.5.0</maven.release.plugin.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
<maven.surefire.plugin.version>3.5.0</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.12</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>
<!-- update DDF version; this build works after building the DDF PR (https://github.com/codice/ddf/pull/6805) with a cherry-pick for https://github.com/codice/ddf/pull/6794) -->
<ddf.version>2.29.2-SNAPSHOT</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>
Expand Down Expand Up @@ -89,6 +97,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>
Expand All @@ -103,7 +112,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>

Expand Down Expand Up @@ -172,42 +181,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>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<maxmem>512M</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>2.4.0</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 -->
Expand All @@ -220,7 +224,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>
Expand All @@ -233,7 +237,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>
Expand All @@ -259,7 +263,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>
Expand Down Expand Up @@ -326,7 +330,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>
Expand All @@ -340,12 +344,12 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<version>1.13.1</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
<goal>compileTests</goal>
</goals>
</execution>
</executions>
Expand Down
16 changes: 5 additions & 11 deletions ui-backend/catalog-ui-search/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,6 @@
<artifactId>persistence-core-api</artifactId>
<version>${ddf.version}</version>
</dependency>
<dependency>
<groupId>ddf.platform</groupId>
<artifactId>preferences-api</artifactId>
<version>${ddf.version}</version>
</dependency>
<dependency>
<groupId>ddf.security.core</groupId>
<artifactId>security-core-api</artifactId>
Expand Down Expand Up @@ -347,12 +342,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>
Expand Down Expand Up @@ -394,6 +383,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>
Expand Down
2 changes: 1 addition & 1 deletion ...og-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions ...alog-ui-search/src/main/java/org/codice/ddf/catalog/ui/forms/model/FilterNodeMapImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions ...i-search/src/test/java/org/codice/ddf/catalog/ui/config/ConfigurationApplicationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions ...catalog-ui-search/src/test/java/org/codice/ddf/catalog/ui/forms/SearchFormsSymbolsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...search/src/test/java/org/codice/ddf/catalog/ui/metacard/QueryMetacardApplicationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...earch/src/test/java/org/codice/ddf/catalog/ui/query/handlers/CqlTransformHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
+ "\"$";

Expand Down
28 changes: 24 additions & 4 deletions ui-frontend/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2852b0e

Please sign in to comment.