X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration%2Fpom.xml;h=0728add41f7a73e351a7392b838ed57ac4092934;hb=7161044baa64d79c7b5dd174b76c5840f5558344;hp=f4b2e3b0ac607e4539b0fdd2d234f7ddf947572f;hpb=a32f244bbb1596a70508dfd0cb63d9856bb5f2b1;p=policy%2Fparent.git

diff --git a/integration/pom.xml b/integration/pom.xml
index f4b2e3b0..0728add4 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2018-2023 AT&T. All rights reserved.
-   Modifications Copyright (C) 2019-2023 Nordix Foundation.
+   Modifications Copyright (C) 2019-2024 Nordix Foundation.
    Modifications Copyright (C) 2020-2022 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>policy-parent</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>integration</artifactId>
     <packaging>pom</packaging>
@@ -38,42 +38,45 @@
     <properties>
         <java.version>17</java.version>
         <!-- Note Well: For RELEASE/SNAPSHOT always set to the project version -->
-        <version.parent.resources>4.0.2-SNAPSHOT</version.parent.resources>
+        <version.parent.resources>4.1.2-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.7.4</version.aaf>
-        <version.ccsdk>1.5.1</version.ccsdk>
-        <version.cucumber>7.13.0</version.cucumber>
-        <version.dmaap>1.1.12</version.dmaap>
+        <version.ccsdk>1.5.3</version.ccsdk>
+        <version.cucumber>7.15.0</version.cucumber>
         <version.docker-java>3.3.2</version.docker-java>
-        <version.drools>8.43.0.Final</version.drools>
+        <version.drools>9.44.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.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.jackson>2.16.1</version.jackson>
+        <version.jacoco>0.8.11</version.jacoco>
+        <version.jaxb>4.0.5</version.jaxb>
+        <version.jersey>3.1.5</version.jersey>
+        <version.jetty>11.0.20</version.jetty>
+        <version.jupiter>5.10.2</version.jupiter>
+        <version.kafka>3.6.1</version.kafka>
+        <version.kotlin>1.9.22</version.kotlin>
+        <version.log4j>2.23.1</version.log4j>
+        <version.logback>1.4.14</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.micrometer>1.11.10</version.micrometer>
         <version.mockito>5.5.0</version.mockito>
         <version.mockserver>5.15.0</version.mockserver>
-        <version.netty>4.1.95.Final</version.netty>
+        <version.netty>4.1.100.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.plexus>3.5.0</version.plexus>
-        <version.sdc>2.0.1</version.sdc>
-        <version.slf4j>2.0.7</version.slf4j>
-        <version.spring>6.0.12</version.spring>
-        <version.springboot>3.1.4</version.springboot>
-        <version.spring-security>6.1.4</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>
+        <version.sdc-dist>2.1.1</version.sdc-dist>
+        <version.sdc-tosca>1.9.0</version.sdc-tosca>
+        <version.slf4j>2.0.12</version.slf4j>
+        <version.spring>6.0.17</version.spring>
+        <version.springboot>3.1.9</version.springboot>
+        <version.spring-security>6.1.7</version.spring-security>
+        <version.swagger.codegen.v3>3.0.52</version.swagger.codegen.v3>
+        <version.swagger.core.v3>2.2.20</version.swagger.core.v3>
         <surefireArgLine>
             --add-opens java.base/java.time=ALL-UNNAMED
             --add-opens java.base/java.util=ALL-UNNAMED
@@ -94,9 +97,11 @@
                 <version>${version.parent.resources}</version>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
                 <version>${version.jackson}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.containers</groupId>
@@ -123,6 +128,11 @@
                 <artifactId>jetty-http</artifactId>
                 <version>${version.jetty}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${version.jetty}</version>
+            </dependency>
 
             <!-- Prometheus Client Libraries -->
             <dependency>
@@ -153,14 +163,40 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.1.1-jre</version>
+                <version>33.0.0-jre</version>
             </dependency>
 
             <!-- Jakarta dependencies -->
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>4.0.0</version>
+                <version>4.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${version.jaxb}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-core</artifactId>
+                <version>${version.jaxb}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-core</artifactId>
+                <version>${version.jaxb}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${version.jaxb}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>${version.jaxb}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.servlet</groupId>
@@ -185,7 +221,7 @@
             <dependency>
                 <groupId>jakarta.inject</groupId>
                 <artifactId>jakarta.inject-api</artifactId>
-                <version>2.0.1.MR</version>
+                <version>2.0.1</version>
             </dependency>
             <!-- Swagger -->
             <dependency>
@@ -214,30 +250,30 @@
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>3.1.4</version>
+                <version>3.3.3</version>
             </dependency>
             <!-- Postgres -->
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>42.6.0</version>
+                <version>42.7.2</version>
             </dependency>
             <!-- Kafka -->
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>
-                <version>3.5.1</version>
+                <version>${version.kafka}</version>
             </dependency>
             <!-- HttpComponents Core (blocking I/O) -->
             <dependency>
                 <groupId>org.apache.httpcomponents.core5</groupId>
                 <artifactId>httpcore5</artifactId>
-                <version>5.2.2</version>
+                <version>5.2.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>
                 <artifactId>httpclient5</artifactId>
-                <version>5.2.1</version>
+                <version>5.3.1</version>
             </dependency>
 
             <!-- JSON marshalling and unmarshalling -->
@@ -249,7 +285,7 @@
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20230618</version>
+                <version>20240303</version>
             </dependency>
             <dependency>
                 <groupId>com.worldturner.medeia</groupId>
@@ -261,11 +297,16 @@
                 <artifactId>medeia-validator-core</artifactId>
                 <version>${version.medeia.validator}</version>
             </dependency>
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path</artifactId>
+                <version>2.9.0</version>
+            </dependency>
             <!-- Lombok -->
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.28</version>
+                <version>1.18.30</version>
             </dependency>
             <!-- Logging -->
             <dependency>
@@ -298,26 +339,6 @@
                 <artifactId>log4j-to-slf4j</artifactId>
                 <version>${version.log4j}</version>
             </dependency>
-            <!-- Dmaap Client -->
-            <dependency>
-                <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                <artifactId>dmaapClient</artifactId>
-                <version>${version.dmaap}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>apache-log4j-extras</artifactId>
-                        <groupId>log4j</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <!-- CDS dependencies -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
@@ -338,18 +359,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <!-- AAF Client -->
-            <dependency>
-                <groupId>org.onap.aaf.authz</groupId>
-                <artifactId>aaf-cadi-aaf</artifactId>
-                <version>${version.aaf}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <!-- Client library for Cambria event routing API -->
             <dependency>
                 <groupId>com.att.nsa</groupId>
@@ -365,7 +374,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>2.0</version>
+                <version>2.2</version>
             </dependency>
             <!-- Drools -->
             <!--
@@ -464,12 +473,12 @@
             <dependency>
                 <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                 <artifactId>sdc-distribution-client</artifactId>
-                <version>${version.sdc}</version>
+                <version>${version.sdc-dist}</version>
             </dependency>
             <dependency>
                 <groupId>org.onap.sdc.sdc-tosca</groupId>
                 <artifactId>sdc-tosca</artifactId>
-                <version>${version.sdc}</version>
+                <version>${version.sdc-tosca}</version>
             </dependency>
 
             <!-- Test dependencies -->
@@ -477,7 +486,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>2.2.220</version>
+                <version>2.2.224</version>
                 <scope>test</scope>
             </dependency>
             <!-- JUNIT -->
@@ -517,7 +526,7 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.24.2</version>
+                <version>3.25.3</version>
                 <scope>test</scope>
             </dependency>
             <!-- Mock libraries -->
@@ -567,6 +576,22 @@
                 <artifactId>netty-handler-proxy</artifactId>
                 <version>${version.netty}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-buffer</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
+
             <!-- Apache Commons -->
             <dependency>
                 <groupId>commons-cli</groupId>
@@ -596,7 +621,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.12.0</version>
+                <version>3.14.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -618,6 +643,16 @@
                 <artifactId>commons-net</artifactId>
                 <version>3.9.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-jexl3</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.4</version>
+            </dependency>
             <!-- Github -->
             <dependency>
                 <groupId>com.github.docker-java</groupId>
@@ -741,11 +776,17 @@
                 <artifactId>spring-boot-starter-test</artifactId>
                 <version>${version.springboot}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.vaadin.external.google</groupId>
+                        <artifactId>android-json</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-core</artifactId>
-                <version>10.1.13</version>
+                <version>10.1.19</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -756,9 +797,66 @@
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-registry-prometheus</artifactId>
-                <version>1.11.2</version>
+                <version>${version.micrometer}</version>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-observation</artifactId>
+                <version>${version.micrometer}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-core</artifactId>
+                <version>${version.micrometer}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-fips</artifactId>
+                <version>1.0.7</version>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry.instrumentation</groupId>
+                <artifactId>opentelemetry-kafka-clients-2.6</artifactId>
+                <version>1.25.0-alpha</version>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry</groupId>
+                <artifactId>opentelemetry-exporter-otlp</artifactId>
+                <version>1.25.0</version>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry</groupId>
+                <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+                <version>1.25.0-alpha</version>
+            </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-tracing-bridge-otel</artifactId>
+                <version>1.1.8</version>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry</groupId>
+                <artifactId>opentelemetry-sdk-extension-jaeger-remote-sampler</artifactId>
+                <version>1.25.0</version>
+            </dependency>
+
+            <!-- Kotlin dependencies -->
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>${version.kotlin}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk8</artifactId>
+                <version>${version.kotlin}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-reflect</artifactId>
+                <version>${version.kotlin}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <scm>
@@ -1014,7 +1112,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1104,6 +1202,11 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${version.jacoco}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>org/drools/**/*</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>