diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5a1e1af3cf1..4af2eb67140 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -46,7 +46,7 @@ jobs: # NOTE: if this gets more complicated, consider having this as a bash script run: mkdir -p ./${{ matrix.module.parent }}/${{ matrix.module.name }}/target && touch ./${{ matrix.module.parent }}/${{ matrix.module.name }}/target/${{ matrix.module.name }}-dummy.jar && docker build --quiet --tag local/${{ matrix.module.name }}:${{ github.sha }} ./${{ matrix.module.parent }}/${{ matrix.module.name }} - name: Scan image for security issues - uses: aquasecurity/trivy-action@0.34.0 + uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0 with: # TODO: we should probably also setup misconfiguration scanning # See https://github.com/aquasecurity/trivy-action#using-trivy-to-scan-infrastucture-as-code diff --git a/checkstyle.xml b/checkstyle.xml index dbfc857956f..0bc1575a72d 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -36,6 +36,16 @@ + + + + + + + diff --git a/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestDataCubeQueryStoreManager.java b/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestDataCubeQueryStoreManager.java index f16b5042610..9f55301ea6c 100644 --- a/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestDataCubeQueryStoreManager.java +++ b/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestDataCubeQueryStoreManager.java @@ -127,8 +127,8 @@ DataCubeQuery build() } } - private TestMongoClientProvider testMongoClientProvider = new TestMongoClientProvider(); - private final DataCubeQueryStoreManager store = new DataCubeQueryStoreManager(testMongoClientProvider.mongoClient); + private TestMongoClientProvider testMongoClientProvider; + private DataCubeQueryStoreManager store; private static final TestVaultImplementation testVaultImplementation = new TestVaultImplementation(); @BeforeClass @@ -150,6 +150,7 @@ public static void cleanUpClass() public void setup() { this.testMongoClientProvider = new TestMongoClientProvider(); + this.store = new DataCubeQueryStoreManager(this.testMongoClientProvider.mongoClient); } @After diff --git a/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestQueryStoreManager.java b/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestQueryStoreManager.java index df7233ab438..6f8c53132cd 100644 --- a/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestQueryStoreManager.java +++ b/legend-engine-application-query/src/test/java/org/finos/legend/engine/application/query/api/TestQueryStoreManager.java @@ -318,8 +318,8 @@ private static QueryParameterValue createTestParameterValue(String name, String return queryParameterValue; } - private TestMongoClientProvider testMongoClientProvider = new TestMongoClientProvider(); - private final QueryStoreManager store = new QueryStoreManager(testMongoClientProvider.mongoClient); + private TestMongoClientProvider testMongoClientProvider; + private QueryStoreManager store; private static final TestVaultImplementation testVaultImplementation = new TestVaultImplementation(); @BeforeClass @@ -341,6 +341,7 @@ public static void cleanUpClass() public void setup() { this.testMongoClientProvider = new TestMongoClientProvider(); + this.store = new QueryStoreManager(this.testMongoClientProvider.mongoClient); } @After diff --git a/legend-engine-xts-iceberg/legend-engine-xt-iceberg-test-support/pom.xml b/legend-engine-xts-iceberg/legend-engine-xt-iceberg-test-support/pom.xml index c611f2cf8e3..6eaf1183488 100644 --- a/legend-engine-xts-iceberg/legend-engine-xt-iceberg-test-support/pom.xml +++ b/legend-engine-xts-iceberg/legend-engine-xt-iceberg-test-support/pom.xml @@ -124,6 +124,11 @@ minio + + com.squareup.okhttp3 + okhttp-jvm + + org.slf4j jcl-over-slf4j @@ -131,4 +136,26 @@ + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + dependency-analyze + + + + com.squareup.okhttp3:okhttp-jvm + + + + + + + diff --git a/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml b/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml index 2c742fc89fa..f3e0c475768 100644 --- a/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml +++ b/legend-engine-xts-sql/legend-engine-xt-sql-postgres-server/pom.xml @@ -293,7 +293,6 @@ org.eclipse.jetty jetty-util - 9.4.44.v20210927 io.prometheus diff --git a/pom.xml b/pom.xml index e50c41e37a4..891bb45e0fc 100644 --- a/pom.xml +++ b/pom.xml @@ -155,8 +155,8 @@ 7.0.2 2.1.214 3.0.6 - 42.7.4 - 2.0.0.3 + 42.7.12 + 2.2.2 3.13.5 1.3.0.0 0.9.6 @@ -170,7 +170,7 @@ 1.15 1.21 1.5 - 2.7 + 2.16.1 3.18.0 1.10.0 0.40.7 @@ -181,7 +181,7 @@ 10.2.0 24.3.25 2.3.34 - 4.8.25 + 4.8.184 2.21.0 1.65.1 33.4.6-jre @@ -199,16 +199,16 @@ 3.1.0 2.0.1 2.25.1 - 9.4.44.v20210927 + 9.4.57.v20241219 2.10.14 - 2.4.7 + 2.5.2 2.17.0 5.11.0 4.13.1 1.2.19 0.1.5 - 1.2.3 - 8.5.5 + 1.2.13 + 8.6.0 4.4.0 5.2.0 5.3.1 @@ -219,7 +219,7 @@ 4.0.0 4.5.8 0.8.1 - 3.25.3 + 3.25.5 1.7.36 1.33 1.5.20 @@ -243,7 +243,7 @@ 3.1.2 3.3.1 3.6.0 - 8.25 + 8.29 3.2.0 3.4.1 3.2.0 @@ -4185,6 +4185,28 @@ + + + com.squareup.okhttp3 + okhttp-jvm + 5.1.0 + + + org.jetbrains + * + + + + + + org.bouncycastle + bcprov-jdk18on + 1.84 +