aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/apex/APEX-User-Manual.rst4
-rw-r--r--integration/pom.xml595
-rw-r--r--integration/src/main/resources/release/pf_release_data.csv26
-rw-r--r--pom.xml2
-rw-r--r--resources/pom.xml2
-rw-r--r--version.properties2
6 files changed, 251 insertions, 380 deletions
diff --git a/docs/apex/APEX-User-Manual.rst b/docs/apex/APEX-User-Manual.rst
index 79232042..8a4996b1 100644
--- a/docs/apex/APEX-User-Manual.rst
+++ b/docs/apex/APEX-User-Manual.rst
@@ -4830,11 +4830,11 @@ Introduction to APEX Logging
All APEX components make extensive use of logging using the
logging façade `SLF4J <https://www.slf4j.org/>`__ with the
- backend `Logback <https://logback.qos.ch/>`__. Both are used
+ backend `Logback <http://logback.qos.ch/>`__. Both are used
off-the-shelve, so the standard documentation and
configuration apply to APEX logging. For details on how to
work with logback please see the `logback
- manual <https://logback.qos.ch/manual/index.html>`__.
+ manual <http://logback.qos.ch/manual/index.html>`__.
.. container:: paragraph
diff --git a/integration/pom.xml b/integration/pom.xml
index a8fbdda1..2be206a0 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -29,84 +29,56 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>policy-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>integration</artifactId>
<packaging>pom</packaging>
<name>Policy Integration POM</name>
<description>Policy Integration POM</description>
<properties>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<!-- Note Well: For RELEASE/SNAPSHOT always set to the project version -->
- <version.parent.resources>3.7.3-SNAPSHOT</version.parent.resources>
+ <version.parent.resources>4.0.1-SNAPSHOT</version.parent.resources>
<jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
<repo.npm>https://nexus3.onap.org/repository/npm.public/npm/-/</repo.npm>
<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
<!-- Dependency Versions -->
- <version.aaf>2.1.21</version.aaf>
- <version.assertj>3.24.2</version.assertj>
- <version.awaitility>4.2.0</version.awaitility>
+ <version.aaf>2.7.4</version.aaf>
<version.ccsdk>1.4.0</version.ccsdk>
- <version.commons-cli>1.5.0</version.commons-cli>
- <version.commons-codec>1.15</version.commons-codec>
- <version.commons-collections4>4.4</version.commons-collections4>
- <version.commons-fileupload>1.5</version.commons-fileupload>
- <version.commons-io>2.11.0</version.commons-io>
- <version.commons-lang3>3.12.0</version.commons-lang3>
- <version.commons-math3>3.6.1</version.commons-math3>
- <version.commons-text>1.10.0</version.commons-text>
- <version.cucumber>7.11.0</version.cucumber>
+ <version.cucumber>7.13.0</version.cucumber>
<version.dmaap>1.1.12</version.dmaap>
- <version.docker-java>3.2.14</version.docker-java>
- <version.drools>8.33.0.Final</version.drools>
- <version.glassfish.jaxb-runtime>2.3.8</version.glassfish.jaxb-runtime>
- <version.google-re2j>1.7</version.google-re2j>
- <version.gson>2.10.1</version.gson>
- <version.h2>2.1.214</version.h2>
- <version.hibernate>5.6.15.Final</version.hibernate>
- <version.hibernate.persistence>1.0.2.Final</version.hibernate.persistence>
- <version.httpcore>4.4.16</version.httpcore>
- <version.io.micrometer>1.10.4</version.io.micrometer>
+ <version.docker-java>3.3.2</version.docker-java>
+ <version.drools>8.43.0.Final</version.drools>
+ <version.frontend.maven>1.13.4</version.frontend.maven>
<version.io.prometheus>0.16.0</version.io.prometheus>
- <version.jackson>2.14.2</version.jackson>
- <version.jakarta.validation-api>2.0.2</version.jakarta.validation-api>
- <version.javax.bind-jaxb-api>2.3.1</version.javax.bind-jaxb-api>
- <version.javax.servlet-api>4.0.1</version.javax.servlet-api>
- <version.javax.ws.rs-api>2.1.1</version.javax.ws.rs-api>
- <version.jboss-jaxrs-api>2.0.2-Final</version.jboss-jaxrs-api>
- <version.jersey>2.39</version.jersey>
- <version.jetty>10.0.13</version.jetty> <!-- Downgrade from oparent -->
- <version.json>20230227</version.json> <!-- Keep this until Cambria Client is removed-->
- <version.junit>4.13.2</version.junit>
- <version.junit.jupiter>5.9.2</version.junit.jupiter>
- <version.junit-vintage>5.9.2</version.junit-vintage>
- <version.kafka>3.4.0</version.kafka>
- <version.log4j>2.19.0</version.log4j>
- <version.logback>1.2.11</version.logback> <!-- Downgrade from oparent -->
- <version.lombok>1.18.26</version.lombok>
- <version.mariadb>3.1.2</version.mariadb>
- <version.medeia>1.1.1</version.medeia>
- <version.mockito-all>1.10.19</version.mockito-all>
- <version.mockito-core>5.1.1</version.mockito-core>
+ <version.jackson>2.15.2</version.jackson>
+ <version.jacoco>0.8.10</version.jacoco>
+ <version.jersey>3.1.3</version.jersey>
+ <version.jetty>11.0.16</version.jetty>
+ <version.jupiter>5.10.0</version.jupiter>
+ <version.log4j>2.20.0</version.log4j>
+ <version.logback>1.4.8</version.logback>
+ <version.maven-remote-resources-plugin>3.1.0</version.maven-remote-resources-plugin>
+ <version.medeia.validator>1.1.1</version.medeia.validator>
+ <version.mockito>5.5.0</version.mockito>
<version.mockserver>5.15.0</version.mockserver>
- <version.netty>4.1.89.Final</version.netty>
+ <version.netty>4.1.95.Final</version.netty>
<version.nsa-cambria>1.2.1-oss</version.nsa-cambria>
<version.nsa-sa-client>1.3.0-oss</version.nsa-sa-client>
- <version.openpojo>0.9.1</version.openpojo>
<version.plexus>3.5.0</version.plexus>
- <version.postgresql>42.5.3</version.postgresql>
<version.sdc>2.0.1</version.sdc>
- <version.slf4j>1.7.36</version.slf4j>
- <version.snakeyaml>1.33</version.snakeyaml>
- <version.spring>5.3.25</version.spring> <!-- Downgrade from oparent -->
- <version.spring-security>5.8.1</version.spring-security>
- <version.springboot>2.7.8</version.springboot>
- <version.springdoc>1.6.14</version.springdoc>
- <version.swagger.core.v3>2.2.8</version.swagger.core.v3>
- <version.swagger-jersey2-jaxrs>1.6.9</version.swagger-jersey2-jaxrs>
- <version.tomcat>9.0.71</version.tomcat> <!-- Downgrade from oparent -->
- <version.websocket>1.5.3</version.websocket>
+ <version.slf4j>2.0.7</version.slf4j>
+ <version.spring>6.0.11</version.spring>
+ <version.springboot>3.1.2</version.springboot>
+ <version.spring-security>6.1.2</version.spring-security>
+ <version.swagger.codegen.v3>3.0.46</version.swagger.codegen.v3>
+ <version.swagger.core.v3>2.2.15</version.swagger.core.v3>
+ <surefireArgLine>
+ --add-opens java.base/java.time=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED
+ --add-opens java.sql/java.sql=ALL-UNNAMED
+ </surefireArgLine>
</properties>
<distributionManagement>
<site>
@@ -122,187 +94,36 @@
<version>${version.parent.resources}</version>
</dependency>
<dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>${version.jakarta.validation-api}</version>
- </dependency>
- <!-- Jackson - needed by glassfish jersey -->
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>jackson-core</artifactId>
<version>${version.jackson}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jsonSchema</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-parameter-names</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.12</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-csv</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-joda</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${version.jackson}</version>
- </dependency>
- <!-- Jersey -->
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jetty-http</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-grizzly2-http</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-moxy</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+ <artifactId>jersey-container-servlet</artifactId>
<version>${version.jersey}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-multipart</artifactId>
- <version>${version.jersey}</version>
- </dependency>
- <!-- Jetty -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${version.jetty}</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <artifactId>jetty-server</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
+ <artifactId>jetty-security</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
+ <artifactId>jetty-util</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
+ <artifactId>jetty-http</artifactId>
<version>${version.jetty}</version>
</dependency>
- <!-- RE2J in lieu of java.util Pattern -->
- <dependency>
- <groupId>com.google.re2j</groupId>
- <artifactId>re2j</artifactId>
- <version>${version.google-re2j}</version>
- </dependency>
- <!-- MariaDB -->
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <version>${version.mariadb}</version>
- </dependency>
- <!-- Postgres -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${version.postgresql}</version>
- </dependency>
- <!-- Kafka -->
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${version.kafka}</version>
- </dependency>
+
<!-- Prometheus Client Libraries -->
<dependency>
<groupId>io.prometheus</groupId>
@@ -316,7 +137,7 @@
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
- <artifactId>simpleclient_servlet</artifactId>
+ <artifactId>simpleclient_servlet_jakarta</artifactId>
<version>${version.io.prometheus}</version>
</dependency>
<dependency>
@@ -324,11 +145,25 @@
<artifactId>simpleclient_logback</artifactId>
<version>${version.io.prometheus}</version>
</dependency>
- <!-- Swagger Jersey2 JAXRS -->
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey2-jaxrs</artifactId>
- <version>${version.swagger-jersey2-jaxrs}</version>
+ <groupId>com.google.re2j</groupId>
+ <artifactId>re2j</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
</dependency>
<!-- Swagger -->
<dependency>
@@ -336,55 +171,78 @@
<artifactId>swagger-annotations</artifactId>
<version>${version.swagger.core.v3}</version>
</dependency>
- <!-- Javax -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${version.javax.servlet-api}</version>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-jaxrs2-jakarta</artifactId>
+ <version>${version.swagger.core.v3}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${version.javax.ws.rs-api}</version>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
+ <version>${version.swagger.core.v3}</version>
</dependency>
- <!-- JAXB -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.javax.bind-jaxb-api}</version>
+ <groupId>io.swagger.parser.v3</groupId>
+ <artifactId>swagger-parser</artifactId>
+ <version>2.1.16</version>
</dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${version.glassfish.jaxb-runtime}</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
+ <!-- Test -->
+ <!-- MariaDB -->
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>3.1.4</version>
+ </dependency>
+ <!-- Postgres -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.6.0</version>
+ </dependency>
+ <!-- Kafka -->
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>3.5.1</version>
</dependency>
<!-- HttpComponents Core (blocking I/O) -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${version.httpcore}</version>
+ <groupId>org.apache.httpcomponents.core5</groupId>
+ <artifactId>httpcore5</artifactId>
+ <version>5.2.2</version>
</dependency>
<!-- JSON marshalling and unmarshalling -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${version.gson}</version>
+ <version>2.10.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>${version.json}</version>
+ <version>20230618</version>
</dependency>
<dependency>
<groupId>com.worldturner.medeia</groupId>
<artifactId>medeia-validator-gson</artifactId>
- <version>${version.medeia}</version>
+ <version>${version.medeia.validator}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.worldturner.medeia</groupId>
+ <artifactId>medeia-validator-core</artifactId>
+ <version>${version.medeia.validator}</version>
</dependency>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>${version.lombok}</version>
+ <version>1.18.28</version>
</dependency>
<!-- Logging -->
<dependency>
@@ -480,17 +338,11 @@
<artifactId>saClientLibrary</artifactId>
<version>${version.nsa-sa-client}</version>
</dependency>
- <!-- Web Sockets -->
- <dependency>
- <groupId>org.java-websocket</groupId>
- <artifactId>Java-WebSocket</artifactId>
- <version>${version.websocket}</version>
- </dependency>
<!-- SnakeYAML -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${version.snakeyaml}</version>
+ <version>2.0</version>
</dependency>
<!-- Drools -->
<!--
@@ -582,8 +434,8 @@
<!-- Springdoc -->
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>${version.springdoc}</version>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.1.0</version>
</dependency>
<!-- SDC -->
<dependency>
@@ -596,31 +448,33 @@
<artifactId>sdc-tosca</artifactId>
<version>${version.sdc}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ws.rs</groupId>
- <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
- <version>${version.jboss-jaxrs-api}</version>
- </dependency>
+
<!-- Test dependencies -->
<!-- In memory Database Engine -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>${version.h2}</version>
+ <version>2.2.220</version>
<scope>test</scope>
</dependency>
<!-- JUNIT -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${version.jupiter}</version>
<scope>test</scope>
</dependency>
<!-- Junit vintage -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>${version.junit-vintage}</version>
+ <version>${version.jupiter}</version>
<scope>test</scope>
</dependency>
<!-- Cucumber Tests -->
@@ -640,33 +494,33 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${version.assertj}</version>
+ <version>3.24.2</version>
<scope>test</scope>
</dependency>
<!-- Mock libraries -->
<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
- <version>${version.openpojo}</version>
+ <version>0.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${version.mockito-all}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${version.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${version.mockito-core}</version>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${version.mockito}</version>
<scope>test</scope>
</dependency>
<!-- Awaitility -->
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>${version.awaitility}</version>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
<!-- Netty -->
@@ -694,42 +548,52 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${version.commons-cli}</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${version.commons-codec}</version>
+ <version>1.16.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${version.commons-fileupload}</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>${version.commons-collections4}</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${version.commons-io}</version>
+ <version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${version.commons-lang3}</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
- <version>${version.commons-math3}</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>${version.commons-text}</version>
+ <version>1.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.9.0</version>
</dependency>
<!-- Github -->
<dependency>
@@ -744,6 +608,18 @@
<version>${version.docker-java}</version>
<scope>test</scope>
</dependency>
+ <!-- Hibernate -->
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>6.3.0.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-jakarta</artifactId>
+ <version>5.6.15.Final</version>
+ </dependency>
+
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -757,7 +633,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
+ <artifactId>spring-jcl</artifactId>
<version>${version.spring}</version>
</dependency>
<dependency>
@@ -767,36 +643,35 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
+ <artifactId>spring-expression</artifactId>
<version>${version.spring}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ <artifactId>spring-webmvc</artifactId>
<version>${version.spring}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-webflux</artifactId>
+ <artifactId>spring-jdbc</artifactId>
<version>${version.spring}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <artifactId>spring-webflux</artifactId>
<version>${version.spring}</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-test</artifactId>
- <version>${version.spring-security}</version>
- <scope>test</scope>
- </dependency>
- <!-- Springboot -->
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${version.springboot}</version>
+ <!-- Exclude the default Jackson dependency -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-json</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -805,23 +680,22 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
<version>${version.springboot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
+ <artifactId>spring-boot-starter-security</artifactId>
<version>${version.springboot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
+ <artifactId>spring-boot-starter-validation</artifactId>
<version>${version.springboot}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
<version>${version.springboot}</version>
</dependency>
<dependency>
@@ -831,55 +705,36 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
<version>${version.springboot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <artifactId>spring-boot-starter-aop</artifactId>
<version>${version.springboot}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
+ <artifactId>spring-boot-starter-test</artifactId>
<version>${version.springboot}</version>
+ <scope>test</scope>
</dependency>
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version.hibernate}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${version.hibernate}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>${version.hibernate.persistence}</version>
- </dependency>
- <!-- Tomcat -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>${version.tomcat}</version>
+ <version>10.1.13</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>${version.tomcat}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-el</artifactId>
- <version>${version.tomcat}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${version.spring}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-websocket</artifactId>
- <version>${version.tomcat}</version>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ <version>1.11.2</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -913,66 +768,66 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <versionRange>2.17,)</versionRange>
+ <version>3.3.0</version>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>3.0.0,)</versionRange>
+ <versionRange>${version.maven-remote-resources-plugin},)</versionRange>
<goals>
<goal>bundle</goal>
<goal>process</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <versionRange>[0.7.1.201405082137,)</versionRange>
+ <version>${version.jacoco}</version>
<goals>
<goal>prepare-agent</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>de.jpdigital</groupId>
- <artifactId>hibernate52-ddl-maven-plugin</artifactId>
- <versionRange>[2.2.0,)</versionRange>
+ <artifactId>hibernate56-ddl-maven-plugin</artifactId>
+ <versionRange>[2.5.0,)</versionRange>
<goals>
<goal>gen-ddl</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
+ <versionRange>[1.5,)</versionRange>
<goals>
<goal>execute</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -985,46 +840,46 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
- <versionRange>[1.5.0,)</versionRange>
+ <versionRange>[1.7.0,)</versionRange>
<goals>
<goal>generateKeyPair</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <versionRange>[1.11.0,)</versionRange>
+ <version>${version.frontend.maven}</version>
<goals>
<goal>npm</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <versionRange>[3.0.0,)</versionRange>
+ <versionRange>[${version.swagger.codegen.v3},)</versionRange>
<goals>
<goal>generate</goal>
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -1041,7 +896,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
<pluginManagement>
@@ -1054,17 +909,17 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>${version.frontend.maven}</version>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.41.0</version>
+ <version>0.43.4</version>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<executions>
<execution>
<goals>
@@ -1087,7 +942,7 @@
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
- <version>3.0.36</version>
+ <version>${version.swagger.codegen.v3}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1097,17 +952,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.4.2</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<release>${java.version}</release>
@@ -1116,7 +971,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1126,7 +981,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1136,42 +991,42 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.20.0</version>
+ <version>3.21.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M7</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${version.maven-remote-resources-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
@@ -1181,7 +1036,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.14.2</version>
+ <version>2.16.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1199,6 +1054,11 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${version.springboot}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -1212,8 +1072,19 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefireArgLine}</argLine>
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
+ <version>${version.jacoco}</version>
<executions>
<execution>
<id>pre-unit-test</id>
@@ -1265,6 +1136,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
@@ -1303,7 +1175,6 @@
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
- <excludes></excludes>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<violationSeverity>warning</violationSeverity>
diff --git a/integration/src/main/resources/release/pf_release_data.csv b/integration/src/main/resources/release/pf_release_data.csv
index c2564e27..d6ca81be 100644
--- a/integration/src/main/resources/release/pf_release_data.csv
+++ b/integration/src/main/resources/release/pf_release_data.csv
@@ -1,14 +1,14 @@
Repo, Last Tag Version,Snapshot Version,Changed Files,Docker Images
-policy/parent,3.7.2,4.0.0-SNAPSHOT,41,
-policy/docker,2.6.2,3.0.0-SNAPSHOT,50,'policy-jre-alpine':'policy-jdk-alpine':'policy-db-migrator'
-policy/common,1.12.2,2.0.0-SNAPSHOT,1,
-policy/models,2.8.2,3.0.0-SNAPSHOT,3,'policy-models-simulator'
-policy/api,2.8.2,3.0.0-SNAPSHOT,2,'policy-api'
-policy/pap,2.8.2,3.0.0-SNAPSHOT,2,'policy-pap'
-policy/apex-pdp,2.9.2,3.0.0-SNAPSHOT,2,'policy-apex-pdp'
-policy/drools-pdp,1.12.2,2.0.0-SNAPSHOT,2,'policy-drools'
-policy/xacml-pdp,2.8.2,3.0.0-SNAPSHOT,2,'policy-xacml-pdp'
-policy/distribution,2.9.2,3.0.0-SNAPSHOT,2,'policy-distribution'
-policy/clamp,6.4.3,7.0.0-SNAPSHOT,7,'policy-clamp-ac-pf-ppnt':'policy-clamp-ac-k8s-ppnt':'policy-clamp-ac-http-ppnt':'policy-clamp-ac-a1pms-ppnt':'policy-clamp-runtime-acm':'policy-clamp-acm-element-impl':'policy-clamp-ac-kserve-ppnt':'policy-clamp-ac-sim-ppnt'
-policy/gui,2.4.2,3.0.0-SNAPSHOT,2,'policy-gui'
-policy/drools-applications,1.12.2,2.0.0-SNAPSHOT,1,'policy-pdpd-cl'
+policy/parent,4.0.0,4.0.1-SNAPSHOT,41,
+policy/docker,3.0.0,3.0.1-SNAPSHOT,50,'policy-jre-alpine':'policy-jdk-alpine':'policy-db-migrator'
+policy/common,2.0.0,2.0.1-SNAPSHOT,1,
+policy/models,3.0.0,3.0.1-SNAPSHOT,3,'policy-models-simulator'
+policy/api,3.0.0,3.0.1-SNAPSHOT,2,'policy-api'
+policy/pap,3.0.0,3.0.1-SNAPSHOT,2,'policy-pap'
+policy/apex-pdp,3.0.0,3.0.1-SNAPSHOT,2,'policy-apex-pdp'
+policy/drools-pdp,2.0.0,2.0.1-SNAPSHOT,2,'policy-drools'
+policy/xacml-pdp,3.0.0,3.0.1-SNAPSHOT,2,'policy-xacml-pdp'
+policy/distribution,3.0.0,3.0.1-SNAPSHOT,2,'policy-distribution'
+policy/clamp,7.0.0,7.0.1-SNAPSHOT,7,'policy-clamp-ac-pf-ppnt':'policy-clamp-ac-k8s-ppnt':'policy-clamp-ac-http-ppnt':'policy-clamp-ac-a1pms-ppnt':'policy-clamp-runtime-acm':'policy-clamp-acm-element-impl':'policy-clamp-ac-kserve-ppnt':'policy-clamp-ac-sim-ppnt'
+policy/gui,3.0.0,3.0.1-SNAPSHOT,2,'policy-gui'
+policy/drools-applications,2.0.0,2.0.1-SNAPSHOT,1,'policy-pdpd-cl'
diff --git a/pom.xml b/pom.xml
index f5a55462..832690b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>policy-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/resources/pom.xml b/resources/pom.xml
index 6b82c769..3d9dbfc7 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>policy-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>policy-parent-resources</artifactId>
diff --git a/version.properties b/version.properties
index 5ae2ec99..56271391 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
minor=4
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}