#101 Updating depdendency versions.

philterd · Jun 28, 2024 · bbd43c0 · bbd43c0
1 parent 25b1483
commit bbd43c0
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 21 deletions.
diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -0,0 +1,29 @@
+name: Build
+on: [workflow_dispatch]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write      
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          lfs: true          
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: adopt
+          architecture: x64
+          cache: maven
+      - name: Build and Test
+        run: mvn --batch-mode --update-snapshots package -Powasp -DnvdApiKey=${{ secrets.NVD_API_KEY }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -8,6 +8,7 @@ Issues whose identifiers start with `PHL-` were previously tracked in Jira befor
 * PHL-312 - Add death date detection similar to the birthdate detection
 * PHL-312 - Add a new condition comparator for “IS NOT” so you can say date filter strategy "IS NOT birthdate" or "IS NOT deathdate"
 * PHL-311 - Return the probabilities of sentiment and offensiveness in addition to the predicted categories
+* [#101](https://github.com/philterd/phileas/issues/101) - Dependency version updates.
 
 ## Version 2.5.0 - November 19, 2023
 

diff --git a/phileas-core/pom.xml b/phileas-core/pom.xml
@@ -142,7 +142,7 @@
 		<dependency>
 			<groupId>io.findify</groupId>
 			<artifactId>s3mock_2.12</artifactId>
-			<version>0.2.5</version>
+			<version>0.2.6</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/phileas-services/phileas-services-metrics/pom.xml b/phileas-services/phileas-services-metrics/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-prometheus</artifactId>
-      <version>${micrometer.version}</version>
+      <version>${dropwizard-metrics-prometheus.version}</version>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-cloudwatch</artifactId>
-      <version>${micrometer.version}</version>
+      <version>${dropwizard-metrics-cloudwatch.version}</version>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>

diff --git a/...eas-services-metrics/src/main/java/ai/philterd/phileas/metrics/PhileasMetricsService.java b/...eas-services-metrics/src/main/java/ai/philterd/phileas/metrics/PhileasMetricsService.java
@@ -32,8 +32,8 @@
 import io.micrometer.datadog.DatadogMeterRegistry;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/pom.xml b/pom.xml
@@ -63,43 +63,44 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<!-- Project dependency versions -->
 		<antlr.version>4.8-1</antlr.version>
-		<aws.version>1.12.380</aws.version>
+		<aws.version>1.12.752</aws.version>
 		<commons.collections4.version>4.4</commons.collections4.version>
 		<commons.lang3.version>3.12.0</commons.lang3.version>
 		<commons.logging.version>1.2</commons.logging.version>
-		<commons.codec.version>1.15</commons.codec.version>
+		<commons.codec.version>1.17.0</commons.codec.version>
 		<commons.csv.version>1.9.0</commons.csv.version>
 		<commons.io.version>2.11.0</commons.io.version>
 		<commons.math.version>3.6.1</commons.math.version>
 		<commons.text.version>1.10.0</commons.text.version>
-		<commons.validator.version>1.7</commons.validator.version>
+		<commons.validator.version>1.9.0</commons.validator.version>
 		<dropwizard.metrics.version>4.1.7</dropwizard.metrics.version>
-		<dropwizard-metrics-cloudwatch.version>1.0.13</dropwizard-metrics-cloudwatch.version>
+		<dropwizard-metrics-cloudwatch.version>1.12.7</dropwizard-metrics-cloudwatch.version>
 		<dropwizard-metrics-datadog.version>1.1.14</dropwizard-metrics-datadog.version>
-		<equals.verifier.version>3.14.2</equals.verifier.version>
+		<dropwizard-metrics-prometheus.version>1.13.1</dropwizard-metrics-prometheus.version>
+		<equals.verifier.version>3.16.1</equals.verifier.version>
 		<ff3.version>1.0</ff3.version>
-		<guava.version>30.1-jre</guava.version>
+		<guava.version>33.2.1-jre</guava.version>
 		<hapi.fhir.version>4.2.0</hapi.fhir.version>
-		<gson.version>2.10.1</gson.version>
+		<gson.version>2.11.0</gson.version>
 		<icu4j.version>67.1</icu4j.version>
 		<javafaker.version>1.0.2</javafaker.version>
-		<json.version>20220924</json.version>
-		<jsoup.version>1.15.3</jsoup.version>
+		<json.version>20240303</json.version>
+		<jsoup.version>1.17.2</jsoup.version>
 		<junit.version>5.10.2</junit.version>
-		<libphonenumber.version>8.13.4</libphonenumber.version>
-		<log4j.version>2.19.0</log4j.version>
+		<libphonenumber.version>8.13.40</libphonenumber.version>
+		<log4j.version>2.23.1</log4j.version>
 		<lucene.version>8.3.0</lucene.version>
 		<maven.compiler.version>3.8.1</maven.compiler.version>
 		<maven.failsafe.version>3.2.5</maven.failsafe.version>
 		<maven.surefire.version>3.2.5</maven.surefire.version>
-		<micrometer.version>1.10.2</micrometer.version>
-		<mockito.version>5.4.0</mockito.version>
+		<micrometer.version>1.13.1</micrometer.version>
+		<mockito.version>5.12.0</mockito.version>
 		<nv-i18n.version>1.27</nv-i18n.version>
 		<opennlp.version>2.1.0</opennlp.version>
 		<pdfbox.version>2.0.23</pdfbox.version>
 		<redis-mock.version>0.1.6</redis-mock.version>
-		<redisson.version>3.27.2</redisson.version>
-		<retrofit.version>2.9.0</retrofit.version>
+		<redisson.version>3.32.0</redisson.version>
+		<retrofit.version>2.11.0</retrofit.version>
 		<scala.major.version>2.12</scala.major.version>
 		<segment.version>2.0.1</segment.version>
 		<spring.boot.version>2.1.8.RELEASE</spring.boot.version>
@@ -260,7 +261,7 @@
 					<plugin>
 						<groupId>org.owasp</groupId>
 						<artifactId>dependency-check-maven</artifactId>
-						<version>5.3.2</version>
+						<version>9.2.0</version>
 						<inherited>false</inherited>
 						<configuration>
 							<retireJsAnalyzerEnabled>false</retireJsAnalyzerEnabled>