diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml new file mode 100644 index 000000000..0e7452f4d --- /dev/null +++ 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 }} \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3bdf81a66..e0b5de03f 100644 --- 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 index 248cea531..d01a3bae1 100644 --- a/phileas-core/pom.xml +++ b/phileas-core/pom.xml @@ -142,7 +142,7 @@ io.findify s3mock_2.12 - 0.2.5 + 0.2.6 test diff --git a/phileas-services/phileas-services-metrics/pom.xml b/phileas-services/phileas-services-metrics/pom.xml index 9271e708a..27f54d1c5 100644 --- a/phileas-services/phileas-services-metrics/pom.xml +++ b/phileas-services/phileas-services-metrics/pom.xml @@ -22,7 +22,7 @@ io.micrometer micrometer-registry-prometheus - ${micrometer.version} + ${dropwizard-metrics-prometheus.version} io.micrometer @@ -32,7 +32,7 @@ io.micrometer micrometer-registry-cloudwatch - ${micrometer.version} + ${dropwizard-metrics-cloudwatch.version} io.micrometer diff --git a/phileas-services/phileas-services-metrics/src/main/java/ai/philterd/phileas/metrics/PhileasMetricsService.java b/phileas-services/phileas-services-metrics/src/main/java/ai/philterd/phileas/metrics/PhileasMetricsService.java index 6417bfaff..c730b36e3 100644 --- a/phileas-services/phileas-services-metrics/src/main/java/ai/philterd/phileas/metrics/PhileasMetricsService.java +++ b/phileas-services/phileas-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 index 3db6fffa0..77c17d36d 100644 --- a/pom.xml +++ b/pom.xml @@ -63,43 +63,44 @@ UTF-8 4.8-1 - 1.12.380 + 1.12.752 4.4 3.12.0 1.2 - 1.15 + 1.17.0 1.9.0 2.11.0 3.6.1 1.10.0 - 1.7 + 1.9.0 4.1.7 - 1.0.13 + 1.12.7 1.1.14 - 3.14.2 + 1.13.1 + 3.16.1 1.0 - 30.1-jre + 33.2.1-jre 4.2.0 - 2.10.1 + 2.11.0 67.1 1.0.2 - 20220924 - 1.15.3 + 20240303 + 1.17.2 5.10.2 - 8.13.4 - 2.19.0 + 8.13.40 + 2.23.1 8.3.0 3.8.1 3.2.5 3.2.5 - 1.10.2 - 5.4.0 + 1.13.1 + 5.12.0 1.27 2.1.0 2.0.23 0.1.6 - 3.27.2 - 2.9.0 + 3.32.0 + 2.11.0 2.12 2.0.1 2.1.8.RELEASE @@ -260,7 +261,7 @@ org.owasp dependency-check-maven - 5.3.2 + 9.2.0 false false