diff options
| author |   Dan Timoney <dtimoney@att.com> | 2023-06-22 16:04:02 -0400 |
|---|---|---|
| committer |   KAPIL SINGAL <ks220y@att.com> | 2023-07-24 13:46:15 +0000 |
| commit | 43836a9e53e965e6057ff08824d2cc4660a90049 (patch) | |
| tree | 598521beb6f90ddecea792aaed160cf6348dc64a /springboot | |
| parent | 6ea1b9009ecc674b0e3000b7a50326908cdba711 (diff) | |
Update parent poms for Argon release
Update versions in parent poms to match OpenDaylight Argon
release version SR1
Issue-ID: CCSDK-3914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I3249f682b6478d129f72c8f1e252e3ff84ce61c2
Diffstat (limited to 'springboot')
18 files changed, 1451 insertions, 590 deletions
diff --git a/springboot/pom.xml b/springboot/pom.xml index 2e0c826e..d64bd21f 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -17,10 +17,10 @@ <modules> <module>spring-boot-setup</module> - <module>springboot1</module> <module>springboot23</module> <module>springboot25</module> <module>springboot26</module> + <module>springboot27</module> <module>springboot30</module> </modules> diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index a75027c1..46336be2 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -24,97 +24,97 @@ <version>2.6</version> <executions> <execution> - <id>create-springboot1-parent-pom</id> + <id>create-springboot23-parent-pom</id> <goals> <goal>copy-resources</goal> </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>../springboot1</outputDirectory> + <outputDirectory>../springboot23</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> <includes> - <include>pom-template-jdk8.xml</include> + <include>pom-template-jdk17.xml</include> </includes> <filtering>true</filtering> </resource> </resources> <escapeString>\</escapeString> <filters> - <filter>${basedir}/src/main/properties/springboot1.properties</filter> + <filter>${basedir}/src/main/properties/springboot23.properties</filter> </filters> <encoding>UTF-8</encoding> </configuration> </execution> <execution> - <id>create-springboot23-parent-pom</id> + <id>create-springboot25-parent-pom</id> <goals> <goal>copy-resources</goal> </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>../springboot23</outputDirectory> + <outputDirectory>../springboot25</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> <includes> - <include>pom-template-jdk8.xml</include> + <include>pom-template-jdk17.xml</include> </includes> <filtering>true</filtering> </resource> </resources> <escapeString>\</escapeString> <filters> - <filter>${basedir}/src/main/properties/springboot23.properties</filter> + <filter>${basedir}/src/main/properties/springboot25.properties</filter> </filters> <encoding>UTF-8</encoding> </configuration> </execution> <execution> - <id>create-springboot25-parent-pom</id> + <id>create-springboot26-parent-pom</id> <goals> <goal>copy-resources</goal> </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>../springboot25</outputDirectory> + <outputDirectory>../springboot26</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> <includes> - <include>pom-template-jdk11.xml</include> + <include>pom-template-jdk17.xml</include> </includes> <filtering>true</filtering> </resource> </resources> <escapeString>\</escapeString> <filters> - <filter>${basedir}/src/main/properties/springboot25.properties</filter> + <filter>${basedir}/src/main/properties/springboot26.properties</filter> </filters> <encoding>UTF-8</encoding> </configuration> </execution> <execution> - <id>create-springboot26-parent-pom</id> + <id>create-springboot27-parent-pom</id> <goals> <goal>copy-resources</goal> </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>../springboot26</outputDirectory> + <outputDirectory>../springboot27</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> <includes> - <include>pom-template-jdk11.xml</include> + <include>pom-template-jdk17.xml</include> </includes> <filtering>true</filtering> </resource> </resources> <escapeString>\</escapeString> <filters> - <filter>${basedir}/src/main/properties/springboot26.properties</filter> + <filter>${basedir}/src/main/properties/springboot27.properties</filter> </filters> <encoding>UTF-8</encoding> </configuration> @@ -151,47 +151,58 @@ <version>1.0.1</version> <executions> <execution> - <id>rename-springboot1-parent-pom</id> + <id>rename-springboot23-parent-pom</id> <phase>validate</phase> <goals> <goal>rename</goal> </goals> <configuration> - <sourceFile>../springboot1/pom-template-jdk8.xml</sourceFile> - <destinationFile>../springboot1/pom.xml</destinationFile> + <sourceFile>../springboot23/pom-template-jdk17.xml</sourceFile> + <destinationFile>../springboot23/pom.xml</destinationFile> </configuration> </execution> <execution> - <id>rename-springboot23-parent-pom</id> + <id>rename-springboot25-parent-pom</id> <phase>validate</phase> <goals> <goal>rename</goal> </goals> <configuration> - <sourceFile>../springboot23/pom-template-jdk8.xml</sourceFile> - <destinationFile>../springboot23/pom.xml</destinationFile> + <sourceFile>../springboot25/pom-template-jdk17.xml</sourceFile> + <destinationFile>../springboot25/pom.xml</destinationFile> </configuration> </execution> <execution> - <id>rename-springboot25-parent-pom</id> + <id>rename-springboot26-parent-pom</id> <phase>validate</phase> <goals> <goal>rename</goal> </goals> <configuration> - <sourceFile>../springboot25/pom-template-jdk11.xml</sourceFile> - <destinationFile>../springboot25/pom.xml</destinationFile> + <sourceFile>../springboot26/pom-template-jdk17.xml</sourceFile> + <destinationFile>../springboot26/pom.xml</destinationFile> </configuration> </execution> <execution> - <id>rename-springboot26-parent-pom</id> + <id>rename-springboot27-parent-pom</id> <phase>validate</phase> <goals> <goal>rename</goal> </goals> <configuration> - <sourceFile>../springboot26/pom-template-jdk11.xml</sourceFile> - <destinationFile>../springboot26/pom.xml</destinationFile> + <sourceFile>../springboot27/pom-template-jdk17.xml</sourceFile> + <destinationFile>../springboot27/pom.xml</destinationFile> + </configuration> + </execution> + <execution> + <id>rename-springboot30-parent-pom</id> + <phase>validate</phase> + <goals> + <goal>rename</goal> + </goals> + <configuration> + <sourceFile>../springboot30/pom-template-jdk17.xml</sourceFile> + <destinationFile>../springboot30/pom.xml</destinationFile> </configuration> </execution> </executions> diff --git a/springboot/spring-boot-setup/src/main/properties/springboot1.properties b/springboot/spring-boot-setup/src/main/properties/springboot1.properties deleted file mode 100644 index 99d6466e..00000000 --- a/springboot/spring-boot-setup/src/main/properties/springboot1.properties +++ /dev/null @@ -1,14 +0,0 @@ -springbootparent.artifactId=spring-boot-starter-parent -springbootparent.groupId=org.springframework.boot -springbootparent.version=1.5.22.RELEASE -springboot.project.artifactId=spring-boot-1-starter-parent -spring.version=4.3.25.RELEASE -springboot.httpcomponents.core.version=4.4.14 -springboot.httpcomponents.client.version=4.5.13 -springboot.jackson.version=2.11.4 -springboot.logback.version=1.2.11 -springboot.netty.ssl.version=2.0.39.Final -springboot.jersey.version=2.30.1 -springboot.slf4j.version=1.7.25 -springboot.springfox.version=2.9.2 -springboot.tomcat.jdbc.version=9.0.46
\ No newline at end of file diff --git a/springboot/spring-boot-setup/src/main/properties/springboot23.properties b/springboot/spring-boot-setup/src/main/properties/springboot23.properties index e693fc54..36d620a8 100644 --- a/springboot/spring-boot-setup/src/main/properties/springboot23.properties +++ b/springboot/spring-boot-setup/src/main/properties/springboot23.properties @@ -12,3 +12,4 @@ springboot.jersey.version=2.30.1 springboot.slf4j.version=1.7.25 springboot.springfox.version=2.9.2 springboot.tomcat.jdbc.version=9.0.46 +springboot.antlr.version=4.12.0 diff --git a/springboot/spring-boot-setup/src/main/properties/springboot25.properties b/springboot/spring-boot-setup/src/main/properties/springboot25.properties index 4f3ee92f..bd396fc2 100644 --- a/springboot/spring-boot-setup/src/main/properties/springboot25.properties +++ b/springboot/spring-boot-setup/src/main/properties/springboot25.properties @@ -18,3 +18,4 @@ springboot.kotlin.maven.version=1.5.32 springboot.kotlin.coroutines.version=1.5.2 springboot.kotlinpoet.version=1.5.0 springboot.mockk.version=1.9.3 +springboot.antlr.version=4.12.0 diff --git a/springboot/spring-boot-setup/src/main/properties/springboot26.properties b/springboot/spring-boot-setup/src/main/properties/springboot26.properties index b9704ccc..0f23e542 100644 --- a/springboot/spring-boot-setup/src/main/properties/springboot26.properties +++ b/springboot/spring-boot-setup/src/main/properties/springboot26.properties @@ -17,4 +17,5 @@ springboot.kotlin.version=1.6.21 springboot.kotlin.maven.version=1.6.21 springboot.kotlin.coroutines.version=1.6.4 springboot.kotlinpoet.version=1.11.0 -springboot.mockk.version=1.12.8
\ No newline at end of file +springboot.mockk.version=1.12.8 +springboot.antlr.version=4.12.0
\ No newline at end of file diff --git a/springboot/spring-boot-setup/src/main/properties/springboot27.properties b/springboot/spring-boot-setup/src/main/properties/springboot27.properties new file mode 100644 index 00000000..255d9b4d --- /dev/null +++ b/springboot/spring-boot-setup/src/main/properties/springboot27.properties @@ -0,0 +1,21 @@ +springbootparent.artifactId=spring-boot-starter-parent +springbootparent.groupId=org.springframework.boot +springbootparent.version=2.7.12 +springboot.project.artifactId=spring-boot-27-starter-parent +spring.version=5.3.27 +springboot.httpcomponents.core.version=4.5.16 +springboot.httpcomponents.client.version=4.5.14 +springboot.jackson.version=2.14.2 +springboot.logback.version=1.4.5 +springboot.netty.ssl.version=2.0.50.Final +springboot.jersey.version=2.33 +springboot.slf4j.version=2.19.0 +springboot.springfox.version=3.0.0 +springboot.tomcat.jdbc.version=9.0.58 +springboot.jacoco.version=0.8.8 +springboot.kotlin.version=1.6.21 +springboot.kotlin.maven.version=1.6.21 +springboot.kotlin.coroutines.version=1.6.4 +springboot.kotlinpoet.version=1.11.0 +springboot.mockk.version=1.12.8 +springboot.antlr.version=4.12.0
\ No newline at end of file diff --git a/springboot/spring-boot-setup/src/main/properties/springboot30.properties b/springboot/spring-boot-setup/src/main/properties/springboot30.properties index 2ccd6b1b..91e96a76 100644 --- a/springboot/spring-boot-setup/src/main/properties/springboot30.properties +++ b/springboot/spring-boot-setup/src/main/properties/springboot30.properties @@ -8,3 +8,4 @@ springboot.httpcomponents.client.version=4.5.14 springboot.jackson.version=2.14.2 springboot.logback.version=1.4.5 springboot.slf4j.version=2.19.0 +springboot.antlr.version=4.12.0 diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml index b90995f4..354d1627 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml @@ -92,10 +92,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml index 5f12e2b9..6ca2c82e 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -113,6 +113,10 @@ <nats.streaming.version>2.2.3</nats.streaming.version> <mockk.version>1.9.3</mockk.version> + + <antlr.version>${springboot.antlr.version}</antlr.version> + <antlr4.version>${springboot.antlr.version}</antlr4.version> + <!-- Managed dependency versions --> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> diff --git a/springboot/springboot23/pom.xml b/springboot/springboot23/pom.xml index e303ef8a..7d4005f4 100644 --- a/springboot/springboot23/pom.xml +++ b/springboot/springboot23/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk8.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk17.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> @@ -51,11 +51,9 @@ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- Jacoco properties --> - <jacoco.version>0.8.5</jacoco.version> + <jacoco.version>0.8.8</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- sitePath may be overridden in the inheriting POM if desired --> @@ -79,10 +77,9 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> - <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> + <java.version>17</java.version> + <maven.compile.plugin.version>3.10.0</maven.compile.plugin.version> + <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> @@ -92,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -106,39 +103,21 @@ <spring.version>5.2.15.RELEASE</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <kotlin.version>1.3.61</kotlin.version> - <kotlin.maven.version>1.3.61</kotlin.maven.version> - <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version> + <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> + <kotlin.version>1.5.32</kotlin.version> + <kotlin.maven.version>1.5.32</kotlin.maven.version> + <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> <kotlinpoet.version>1.5.0</kotlinpoet.version> <kroto-plus.version>0.5.0</kroto-plus.version> <nats.version>2.6.6</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> <mockk.version>1.9.3</mockk.version> + + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <!-- Managed dependency versions --> - <antlr.version>4.8-1</antlr.version> - <commons.lang.version>2.6</commons.lang.version> - <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version> - <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> - <derby.version>10.14.2.0</derby.version> - <eelf.version>1.0.0</eelf.version> - <grpc.version>1.25.0</grpc.version> - <netty-ssl>2.0.39.Final</netty-ssl> - <protobuff.java.version>3.10.0</protobuff.java.version> - <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> - <jersey.version>2.30.1</jersey.version> - <jersey.client.version>2.30.1</jersey.client.version> - <jettison.version>1.3.8</jettison.version> - <log4j.version>2.17.2</log4j.version> - <log4j2.version>2.17.2</log4j2.version> - <logback.version>1.2.11</logback.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> - <mariadb4j.version>2.4.0</mariadb4j.version> - <slf4j.version>1.7.25</slf4j.version> - <springfox.version>2.9.2</springfox.version> - <testng.version>6.14.3</testng.version> - <tomcat-jdbc.version>9.0.46</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -203,16 +182,6 @@ <artifactId>liquibase-core</artifactId> <version>4.4.2-nordix</version> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -297,18 +266,7 @@ <enabled>true</enabled> </snapshots> </pluginRepository> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> </pluginRepositories> <build> @@ -418,7 +376,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> @@ -431,7 +388,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> <executions> <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> <execution> @@ -452,14 +408,16 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compile.plugin.version}</version> <configuration> - <source>${java.version.source}</source> - <target>${java.version.target}</target> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> </configuration> </plugin> <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.6.0.1398</version> + <version>3.7.0.1746</version> </plugin> <!-- End of plugins from ONAP oparent --> @@ -467,50 +425,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.2.0</version> <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${apache.httpcomponents.core.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${apache.httpcomponents.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons.lang.version}</version> - </additionalDependency> - </additionalDependencies> <failOnError>false</failOnError> </configuration> <executions> @@ -892,7 +807,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> + <version>${maven-antrun-plugin.version}</version> <executions> <execution> <phase>initialize</phase> @@ -972,7 +887,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <version>3.1.0</version> <executions> <execution> <id>swagger-generate-sources</id> diff --git a/springboot/springboot30/pom-template-jdk17.xml b/springboot/springboot25/pom-template-jdk11.xml index 162efaf3..88fae6ee 100644 --- a/springboot/springboot30/pom-template-jdk17.xml +++ b/springboot/springboot25/pom-template-jdk11.xml @@ -2,19 +2,19 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk17.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.0.3</version> + <version>2.5.10</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>spring-boot-30-starter-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <artifactId>spring-boot-25-starter-parent</artifactId> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -51,7 +51,7 @@ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- Jacoco properties --> - <jacoco.version>0.8.8</jacoco.version> + <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -77,8 +77,11 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version>17</java.version> - <maven.compile.plugin.version>3.10.0</maven.compile.plugin.version> + <java.version>11</java.version> + <bundle.plugin.version>2.5.0</bundle.plugin.version> + <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version> + <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> @@ -99,8 +102,8 @@ <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> <!-- Spring versions --> - <spring.boot.version>3.0.3</spring.boot.version> - <spring.version>6.0.4</spring.version> + <spring.boot.version>2.5.10</spring.boot.version> + <spring.version>5.3.16</spring.version> <!-- Kotlin versions --> <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> @@ -114,6 +117,28 @@ <mockk.version>1.9.3</mockk.version> <!-- Managed dependency versions --> + <antlr.version>4.8-1</antlr.version> + <commons.lang.version>2.6</commons.lang.version> + <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version> + <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> + <derby.version>10.14.2.0</derby.version> + <eelf.version>1.0.0</eelf.version> + <grpc.version>1.29.0</grpc.version> + <netty-ssl>2.0.50.Final</netty-ssl> + <protobuff.java.version>3.10.0</protobuff.java.version> + <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> + <jersey.version>2.33</jersey.version> + <jersey.client.version>2.33</jersey.client.version> + <jettison.version>1.3.8</jettison.version> + <log4j.version>2.17.2</log4j.version> + <log4j2.version>2.17.2</log4j2.version> + <logback.version>1.2.11</logback.version> + <mariadb.connector.version>2.7.3</mariadb.connector.version> + <mariadb4j.version>2.4.0</mariadb4j.version> + <slf4j.version>1.7.36</slf4j.version> + <springfox.version>3.0.0</springfox.version> + <testng.version>6.14.3</testng.version> + <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -125,14 +150,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>2.14.2</version> + <version>2.12.6</version> <type>pom</type> <scope>import</scope> </dependency> @@ -372,6 +397,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> @@ -384,6 +410,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> + <version>2.19.1</version> <executions> <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> <execution> @@ -413,7 +440,7 @@ <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.7.0.1746</version> + <version>3.6.0.1398</version> </plugin> <!-- End of plugins from ONAP oparent --> @@ -421,7 +448,50 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <version>3.2.0</version> <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.client.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>${jersey.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>${apache.httpcomponents.core.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>${apache.httpcomponents.client.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons.lang.version}</version> + </additionalDependency> + </additionalDependencies> <failOnError>false</failOnError> </configuration> <executions> @@ -883,7 +953,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>3.1.0</version> + <version>1.5.0</version> <executions> <execution> <id>swagger-generate-sources</id> diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index 88fae6ee..10fbdfaf 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk17.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> @@ -51,7 +51,7 @@ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- Jacoco properties --> - <jacoco.version>0.8.5</jacoco.version> + <jacoco.version>0.8.8</jacoco.version> <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -77,11 +77,8 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version>11</java.version> - <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version> - <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> + <java.version>17</java.version> + <maven.compile.plugin.version>3.10.0</maven.compile.plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> @@ -92,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -116,29 +113,11 @@ <nats.streaming.version>2.2.3</nats.streaming.version> <mockk.version>1.9.3</mockk.version> + + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <!-- Managed dependency versions --> - <antlr.version>4.8-1</antlr.version> - <commons.lang.version>2.6</commons.lang.version> - <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version> - <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> - <derby.version>10.14.2.0</derby.version> - <eelf.version>1.0.0</eelf.version> - <grpc.version>1.29.0</grpc.version> - <netty-ssl>2.0.50.Final</netty-ssl> - <protobuff.java.version>3.10.0</protobuff.java.version> - <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> - <jersey.version>2.33</jersey.version> - <jersey.client.version>2.33</jersey.client.version> - <jettison.version>1.3.8</jettison.version> - <log4j.version>2.17.2</log4j.version> - <log4j2.version>2.17.2</log4j2.version> - <logback.version>1.2.11</logback.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> - <mariadb4j.version>2.4.0</mariadb4j.version> - <slf4j.version>1.7.36</slf4j.version> - <springfox.version>3.0.0</springfox.version> - <testng.version>6.14.3</testng.version> - <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -397,7 +376,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> @@ -410,7 +388,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> <executions> <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> <execution> @@ -440,7 +417,7 @@ <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.6.0.1398</version> + <version>3.7.0.1746</version> </plugin> <!-- End of plugins from ONAP oparent --> @@ -448,50 +425,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.2.0</version> <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${apache.httpcomponents.core.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${apache.httpcomponents.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons.lang.version}</version> - </additionalDependency> - </additionalDependencies> <failOnError>false</failOnError> </configuration> <executions> @@ -953,7 +887,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <version>3.1.0</version> <executions> <execution> <id>swagger-generate-sources</id> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk8.xml b/springboot/springboot26/pom-template-jdk11.xml index 5f10cb0c..6b7e4d75 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk8.xml +++ b/springboot/springboot26/pom-template-jdk11.xml @@ -2,22 +2,22 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk8.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> - <groupId>${springbootparent.groupId}</groupId> - <artifactId>${springbootparent.artifactId}</artifactId> - <version>${springbootparent.version}</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.6.11</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>${springboot.project.artifactId}</artifactId> - <version>${project.version}</version> + <artifactId>spring-boot-26-starter-parent</artifactId> + <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>ONAP :: \${project.groupId} :: \${project.artifactId}</name> + <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> <description>Root POM to be used in place of spring-boot parent for CCSDK based projects</description> <url>http://wiki.onap.org</url> <organization> @@ -32,11 +32,11 @@ <distributionManagement> <repository> <id>ecomp-releases</id> - <url>\${onap.nexus.release-url}</url> + <url>${onap.nexus.release-url}</url> </repository> <snapshotRepository> <id>ecomp-snapshots</id> - <url>\${onap.nexus.snapshot-url}</url> + <url>${onap.nexus.snapshot-url}</url> </snapshotRepository> </distributionManagement> @@ -46,25 +46,23 @@ <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <!-- Default Sonar configuration --> - <sonar.coverage.jacoco.xmlReportPaths>\${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,\${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> <!-- Note: This list should match jacoco-maven-plugin's exclusion list below --> <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- Jacoco properties --> - <jacoco.version>0.8.5</jacoco.version> + <jacoco.version>0.8.8</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- sitePath may be overridden in the inheriting POM if desired --> - <sitePath>/content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version}</sitePath> + <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> <!-- If following file exist, auto-generation of swagger.json will be done --> - <swagger-properties>\${basedir}/src/main/resources/swagger.properties</swagger-properties> + <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties> <!-- If following file exist, auto-generation of sdk will be done --> - <swagger-json>\${basedir}/src/main/resources/swagger.json</swagger-json> + <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json> <!-- end of properties from oparent --> <!-- ONAP repositories --> @@ -79,10 +77,12 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version>11</java.version> <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> + <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version> + <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> + <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> @@ -102,43 +102,43 @@ <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> <!-- Spring versions --> - <spring.boot.version>${springbootparent.version}</spring.boot.version> - <spring.version>${spring.version}</spring.version> + <spring.boot.version>2.6.11</spring.boot.version> + <spring.version>5.3.22</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <kotlin.version>1.3.61</kotlin.version> - <kotlin.maven.version>1.3.61</kotlin.maven.version> - <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version> - <kotlinpoet.version>1.5.0</kotlinpoet.version> + <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> + <kotlin.version>1.6.21</kotlin.version> + <kotlin.maven.version>1.6.21</kotlin.maven.version> + <kotlin.couroutines.version>1.6.4</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> <kroto-plus.version>0.5.0</kroto-plus.version> <nats.version>2.6.6</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.9.3</mockk.version> + <mockk.version>1.12.8</mockk.version> <!-- Managed dependency versions --> <antlr.version>4.8-1</antlr.version> <commons.lang.version>2.6</commons.lang.version> - <apache.httpcomponents.core.version>${springboot.httpcomponents.core.version}</apache.httpcomponents.core.version> - <apache.httpcomponents.client.version>${springboot.httpcomponents.client.version}</apache.httpcomponents.client.version> + <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version> + <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> - <grpc.version>1.25.0</grpc.version> - <netty-ssl>${springboot.netty.ssl.version}</netty-ssl> + <grpc.version>1.29.0</grpc.version> + <netty-ssl>2.0.50.Final</netty-ssl> <protobuff.java.version>3.10.0</protobuff.java.version> <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> - <jersey.version>${springboot.jersey.version}</jersey.version> - <jersey.client.version>${springboot.jersey.version}</jersey.client.version> + <jersey.version>2.33</jersey.version> + <jersey.client.version>2.33</jersey.client.version> <jettison.version>1.3.8</jettison.version> <log4j.version>2.17.2</log4j.version> <log4j2.version>2.17.2</log4j2.version> - <logback.version>${springboot.logback.version}</logback.version> + <logback.version>1.2.11</logback.version> <mariadb.connector.version>2.7.3</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> - <slf4j.version>${springboot.slf4j.version}</slf4j.version> - <springfox.version>${springboot.springfox.version}</springfox.version> + <slf4j.version>1.7.36</slf4j.version> + <springfox.version>3.0.0</springfox.version> <testng.version>6.14.3</testng.version> - <tomcat-jdbc.version>${springboot.tomcat.jdbc.version}</tomcat-jdbc.version> + <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -150,76 +150,66 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>${project.version}</version> + <version>2.6.0-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>${springboot.jackson.version}</version> + <version>2.14.0-rc1</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>\${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>\${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>\${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.core.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> - <version>\${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-provider</artifactId> - <version>\${ccsdk.sli.adaptors.version}</version> + <version>${ccsdk.sli.adaptors.version}</version> </dependency> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> - <version>\${logging-analytics.version}</version> + <version>${logging-analytics.version}</version> </dependency> <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-filter-base</artifactId> - <version>\${logging-analytics.version}</version> + <version>${logging-analytics.version}</version> </dependency> <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> <version>4.4.2-nordix</version> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> </dependencies> </dependencyManagement> <repositories> <repository> <id>onap-public</id> - <url>\${onap.nexus.public-url}</url> + <url>${onap.nexus.public-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -231,7 +221,7 @@ </repository> <repository> <id>onap-staging</id> - <url>\${onap.nexus.staging-url}</url> + <url>${onap.nexus.staging-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -244,7 +234,7 @@ <repository> <id>ecomp-release</id> <name>onap-repository-releases</name> - <url>\${onap.nexus.release-url}</url> + <url>${onap.nexus.release-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -256,7 +246,7 @@ <repository> <id>ecomp-snapshot</id> <name>onap-repository-snapshots</name> - <url>\${onap.nexus.snapshot-url}</url> + <url>${onap.nexus.snapshot-url}</url> <releases> <enabled>false</enabled> </releases> @@ -269,7 +259,7 @@ <pluginRepositories> <pluginRepository> <id>onap-public</id> - <url>\${onap.nexus.public-url}</url> + <url>${onap.nexus.public-url}</url> <releases> <enabled>true</enabled> </releases> @@ -279,7 +269,7 @@ </pluginRepository> <pluginRepository> <id>onap-staging</id> - <url>\${onap.nexus.staging-url}</url> + <url>${onap.nexus.staging-url}</url> <releases> <enabled>true</enabled> </releases> @@ -289,7 +279,7 @@ </pluginRepository> <pluginRepository> <id>onap-snapshot</id> - <url>\${onap.nexus.snapshot-url}</url> + <url>${onap.nexus.snapshot-url}</url> <releases> <enabled>false</enabled> </releases> @@ -297,18 +287,7 @@ <enabled>true</enabled> </snapshots> </pluginRepository> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> </pluginRepositories> <build> @@ -384,7 +363,7 @@ <includeResources>false</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>false</includeTestResources> - <sourceDirectory>\${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> <excludes> </excludes> <failsOnError>false</failsOnError> @@ -402,7 +381,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>\${project.build.sourceDirectory}/src/main/java</sourceDirectory> + <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> @@ -421,7 +400,7 @@ <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> - <argLine>\${surefireArgLine}</argLine> + <argLine>${surefireArgLine}</argLine> <!-- Excludes integration tests when unit tests are run. --> <excludes> <exclude>**/IT*.java</exclude> @@ -442,7 +421,7 @@ </goals> <configuration> <!-- Sets the VM argument line used when integration tests are run. --> - <argLine>\${failsafeArgLine}</argLine> + <argLine>${failsafeArgLine}</argLine> </configuration> </execution> </executions> @@ -450,10 +429,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>\${maven.compile.plugin.version}</version> + <version>${maven.compile.plugin.version}</version> <configuration> - <source>\${java.version.source}</source> - <target>\${java.version.target}</target> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> </configuration> </plugin> <plugin> @@ -473,42 +454,42 @@ <additionalDependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>\${slf4j.version}</version> + <version>${slf4j.version}</version> </additionalDependency> <additionalDependency> <groupId>org.antlr</groupId> <artifactId>antlr4</artifactId> - <version>\${antlr.version}</version> + <version>${antlr.version}</version> </additionalDependency> <additionalDependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> - <version>\${antlr.version}</version> + <version>${antlr.version}</version> </additionalDependency> <additionalDependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>\${jersey.client.version}</version> + <version>${jersey.client.version}</version> </additionalDependency> <additionalDependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>\${jersey.version}</version> + <version>${jersey.version}</version> </additionalDependency> <additionalDependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> - <version>\${apache.httpcomponents.core.version}</version> + <version>${apache.httpcomponents.core.version}</version> </additionalDependency> <additionalDependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>\${apache.httpcomponents.client.version}</version> + <version>${apache.httpcomponents.client.version}</version> </additionalDependency> <additionalDependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>\${commons.lang.version}</version> + <version>${commons.lang.version}</version> </additionalDependency> </additionalDependencies> <failOnError>false</failOnError> @@ -529,8 +510,8 @@ <version>3.3.0</version> <configuration> <graphFormat>text</graphFormat> - <outputFileName>\${dependency-list.file}</outputFileName> - <outputDirectory>\${project.basedir}</outputDirectory> + <outputFileName>${dependency-list.file}</outputFileName> + <outputDirectory>${project.basedir}</outputDirectory> <transitiveExcludes>*</transitiveExcludes> <showVersions>true</showVersions> <showGroupIds>true</showGroupIds> @@ -544,7 +525,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>\${jacoco.version}</version> + <version>${jacoco.version}</version> <executions> <execution> <id>pre-unit-test</id> @@ -553,7 +534,7 @@ </goals> <configuration> <!-- Sets the path to the file which contains the execution data. --> - <destFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</destFile> + <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile> <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. --> <propertyName>surefireArgLine</propertyName> </configuration> @@ -567,9 +548,9 @@ </goals> <configuration> <!-- Sets the path to the file which contains the execution data. --> - <dataFile>\${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> + <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>\${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> </configuration> </execution> <execution> @@ -580,7 +561,7 @@ </goals> <configuration> <!-- Sets the path to the file which contains the execution data. --> - <destFile>\${project.build.directory}/code-coverage/jacoco-it.exec</destFile> + <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile> <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. --> <propertyName>failsafeArgLine</propertyName> </configuration> @@ -594,9 +575,9 @@ </goals> <configuration> <!-- Sets the path to the file which contains the execution data. --> - <dataFile>\${project.build.directory}/code-coverage/jacoco-it.exec</dataFile> + <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile> <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>\${project.reporting.outputDirectory}/jacoco-it</outputDirectory> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> </configuration> </execution> <execution> @@ -671,11 +652,11 @@ <properties> <property> <name>maven.wagon.http.ssl.allowall</name> - <value>\${ssl.allowall}</value> + <value>${ssl.allowall}</value> </property> <property> <name>maven.wagon.http.ssl.insecure</name> - <value>\${ssl.insecure}</value> + <value>${ssl.insecure}</value> </property> </properties> </configuration> @@ -694,7 +675,7 @@ <artifactId>maven-scm-plugin</artifactId> <version>1.8.1</version> <configuration> - <tag>\${project.artifactId}-\${project.version}</tag> + <tag>${project.artifactId}-${project.version}</tag> </configuration> </plugin> <plugin> @@ -795,7 +776,7 @@ <id>generate-json</id> <activation> <file> - <exists>\${swagger-properties}</exists> + <exists>${swagger-properties}</exists> </file> <property> <name>swagger-sdk.generate-json</name> @@ -815,7 +796,7 @@ </goals> <configuration> <files> - <file>\${basedir}/src/main/resources/swagger.properties</file> + <file>${basedir}/src/main/resources/swagger.properties</file> </files> </configuration> </execution> @@ -828,19 +809,19 @@ <configuration> <apiSources> <apiSource> - <locations>\${api-rest-package}</locations> + <locations>${api-rest-package}</locations> <schemes>http,https</schemes> - <host>\${api-host-ip}:\${api-host-port}</host> - <basePath>\${api-base-path}</basePath> + <host>${api-host-ip}:${api-host-port}</host> + <basePath>${api-base-path}</basePath> <info> - <title>\${api-title}</title> - <version>\${api-version}</version> - <description>\${api-description}</description> + <title>${api-title}</title> + <version>${api-version}</version> + <description>${api-description}</description> <license> - <name>\${api-license}</name> + <name>${api-license}</name> </license> </info> - <swaggerDirectory>\${basedir}/src/main/resources</swaggerDirectory> + <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory> </apiSource> </apiSources> </configuration> @@ -865,10 +846,10 @@ <goal>install-file</goal> </goals> <configuration> - <file>\${basedir}/src/main/resources/swagger.json</file> - <groupId>\${project.groupId}</groupId> - <artifactId>\${project.artifactId}-swagger-schema</artifactId> - <version>\${project.version}</version> + <file>${basedir}/src/main/resources/swagger.json</file> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}-swagger-schema</artifactId> + <version>${project.version}</version> <packaging>json</packaging> </configuration> </execution> @@ -881,7 +862,7 @@ <id>generate-sdk</id> <activation> <file> - <exists>\${swagger-json}</exists> + <exists>${swagger-json}</exists> </file> <property> <name>swagger-sdk.generate-java-sdk</name> @@ -892,7 +873,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> + <version>${maven-antrun-plugin.version}</version> <executions> <execution> <phase>initialize</phase> @@ -908,17 +889,17 @@ <os family="unix"/> </condition> <if> - <equals arg1="\${is_windows}" arg2="true"/> + <equals arg1="${is_windows}" arg2="true"/> <then> <property name="swagger.sdk.script.file" value="generated-source-script.bat"/> - <echo file="\${project.build.directory}\${file.separator}generated-source-script.bat" append="true" message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/> - <echo file="\${project.build.directory}\${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> </then> <else> <property name="swagger.sdk.script.file" value="generated-source-script.sh"/> - <echo file="\${project.build.directory}\${file.separator}generated-source-script.sh" append="true" message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/> - <echo file="\${project.build.directory}\${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/> - <chmod file="\${project.build.directory}\${file.separator}generated-source-script.sh" perm="755"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/> </else> </if> </tasks> @@ -952,19 +933,19 @@ <goal>generate</goal> </goals> <configuration> - <inputSpec>\${basedir}/src/main/resources/swagger.json</inputSpec> - <output>\${project.build.directory}/generated-sources</output> + <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec> + <output>${project.build.directory}/generated-sources</output> <language>java</language> <configOptions> <dateLibrary>joda</dateLibrary> </configOptions> <library>jersey2</library> - <groupId>\${project.groupId}</groupId> - <artifactId>\${project.artifactId}-java-sdk</artifactId> - <artifactVersion>\${project.version}</artifactVersion> - <modelPackage>\${project.groupId}.\${project.artifactId}.client.model</modelPackage> - <apiPackage>\${project.groupId}.\${project.artifactId}.client.api</apiPackage> - <invokerPackage>\${project.groupId}.\${project.artifactId}.client.invoker</invokerPackage> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}-java-sdk</artifactId> + <artifactVersion>${project.version}</artifactVersion> + <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage> + <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage> + <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage> </configuration> </execution> </executions> @@ -981,7 +962,7 @@ <goal>exec</goal> </goals> <configuration> - <executable>\${project.build.directory}\${file.separator}\${swagger.sdk.script.file}</executable> + <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable> </configuration> </execution> </executions> @@ -1000,7 +981,7 @@ <configuration> <filesets> <fileset> - <directory>\${project.build.directory}/generated-sources</directory> + <directory>${project.build.directory}/generated-sources</directory> </fileset> </filesets> </configuration> @@ -1083,7 +1064,7 @@ <destFile>${onap.jacoco.aggregateFile}</destFile> <fileSets> <fileSet> - <directory>\${project.basedir}</directory> + <directory>${project.basedir}</directory> <includes> <include>**/target/code-coverage/*.exec</include> </includes> diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml index 6b7e4d75..dcbc9fc4 100644 --- a/springboot/springboot26/pom.xml +++ b/springboot/springboot26/pom.xml @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk17.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> @@ -77,11 +77,8 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version>11</java.version> - <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version> - <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> + <java.version>17</java.version> + <maven.compile.plugin.version>3.10.0</maven.compile.plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> @@ -92,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -107,38 +104,20 @@ <!-- Kotlin versions --> <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> - <kotlin.version>1.6.21</kotlin.version> - <kotlin.maven.version>1.6.21</kotlin.maven.version> - <kotlin.couroutines.version>1.6.4</kotlin.couroutines.version> - <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kotlin.version>1.5.32</kotlin.version> + <kotlin.maven.version>1.5.32</kotlin.maven.version> + <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> + <kotlinpoet.version>1.5.0</kotlinpoet.version> <kroto-plus.version>0.5.0</kroto-plus.version> <nats.version>2.6.6</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> - <mockk.version>1.12.8</mockk.version> + <mockk.version>1.9.3</mockk.version> + + + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> <!-- Managed dependency versions --> - <antlr.version>4.8-1</antlr.version> - <commons.lang.version>2.6</commons.lang.version> - <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version> - <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> - <derby.version>10.14.2.0</derby.version> - <eelf.version>1.0.0</eelf.version> - <grpc.version>1.29.0</grpc.version> - <netty-ssl>2.0.50.Final</netty-ssl> - <protobuff.java.version>3.10.0</protobuff.java.version> - <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> - <jersey.version>2.33</jersey.version> - <jersey.client.version>2.33</jersey.client.version> - <jettison.version>1.3.8</jettison.version> - <log4j.version>2.17.2</log4j.version> - <log4j2.version>2.17.2</log4j2.version> - <logback.version>1.2.11</logback.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> - <mariadb4j.version>2.4.0</mariadb4j.version> - <slf4j.version>1.7.36</slf4j.version> - <springfox.version>3.0.0</springfox.version> - <testng.version>6.14.3</testng.version> - <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -397,7 +376,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> @@ -410,7 +388,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> <executions> <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> <execution> @@ -440,7 +417,7 @@ <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.6.0.1398</version> + <version>3.7.0.1746</version> </plugin> <!-- End of plugins from ONAP oparent --> @@ -448,50 +425,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.2.0</version> <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${apache.httpcomponents.core.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${apache.httpcomponents.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons.lang.version}</version> - </additionalDependency> - </additionalDependencies> <failOnError>false</failOnError> </configuration> <executions> @@ -953,7 +887,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <version>3.1.0</version> <executions> <execution> <id>swagger-generate-sources</id> diff --git a/springboot/springboot27/pom-template-jdk11.xml b/springboot/springboot27/pom-template-jdk11.xml new file mode 100644 index 00000000..6b7e4d75 --- /dev/null +++ b/springboot/springboot27/pom-template-jdk11.xml @@ -0,0 +1,1082 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml + Any updates needed should be made to that template and not to the generated + pom.xml file --> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.6.11</version> + <relativePath/> + </parent> + + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>spring-boot-26-starter-parent</artifactId> + <version>2.6.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> + <description>Root POM to be used in place of spring-boot parent for CCSDK based projects</description> + <url>http://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> + + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <url>${onap.nexus.release-url}</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <url>${onap.nexus.snapshot-url}</url> + </snapshotRepository> + </distributionManagement> + + <properties> + <!-- Sonar properties --> + <sonar.scanner.version>3.7.0.1746</sonar.scanner.version> + <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> + <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> + <!-- Default Sonar configuration --> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + <!-- Note: This list should match jacoco-maven-plugin's exclusion list below --> + <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> + + <!-- Jacoco properties --> + <jacoco.version>0.8.8</jacoco.version> + <!-- properties from oparent --> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <!-- sitePath may be overridden in the inheriting POM if desired --> + <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> + + <!-- If following file exist, auto-generation of swagger.json will be done --> + <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties> + <!-- If following file exist, auto-generation of sdk will be done --> + <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json> + <!-- end of properties from oparent --> + + <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <onap.nexus.host>nexus.onap.org</onap.nexus.host> + <onap.nexus.port>443</onap.nexus.port> + <onap.nexus.protocol>https</onap.nexus.protocol> + <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url> + <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url> + <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url> + <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url> + <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> + <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> + + <java.version>11</java.version> + <bundle.plugin.version>2.5.0</bundle.plugin.version> + <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version> + <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> + <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> + <features.file>features.xml</features.file> + <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> + <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> + <checkstyle.skip>true</checkstyle.skip> + + <!-- logging-analytics versions --> + <logging-analytics.version>1.6.9</logging-analytics.version> + + <!-- CCSDK component versions --> + <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> + + <!-- Spring versions --> + <spring.boot.version>2.6.11</spring.boot.version> + <spring.version>5.3.22</spring.version> + + <!-- Kotlin versions --> + <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> + <kotlin.version>1.6.21</kotlin.version> + <kotlin.maven.version>1.6.21</kotlin.maven.version> + <kotlin.couroutines.version>1.6.4</kotlin.couroutines.version> + <kotlinpoet.version>1.11.0</kotlinpoet.version> + <kroto-plus.version>0.5.0</kroto-plus.version> + <nats.version>2.6.6</nats.version> + <nats.streaming.version>2.2.3</nats.streaming.version> + <mockk.version>1.12.8</mockk.version> + + <!-- Managed dependency versions --> + <antlr.version>4.8-1</antlr.version> + <commons.lang.version>2.6</commons.lang.version> + <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version> + <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> + <derby.version>10.14.2.0</derby.version> + <eelf.version>1.0.0</eelf.version> + <grpc.version>1.29.0</grpc.version> + <netty-ssl>2.0.50.Final</netty-ssl> + <protobuff.java.version>3.10.0</protobuff.java.version> + <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> + <jersey.version>2.33</jersey.version> + <jersey.client.version>2.33</jersey.client.version> + <jettison.version>1.3.8</jettison.version> + <log4j.version>2.17.2</log4j.version> + <log4j2.version>2.17.2</log4j2.version> + <logback.version>1.2.11</logback.version> + <mariadb.connector.version>2.7.3</mariadb.connector.version> + <mariadb4j.version>2.4.0</mariadb4j.version> + <slf4j.version>1.7.36</slf4j.version> + <springfox.version>3.0.0</springfox.version> + <testng.version>6.14.3</testng.version> + <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version> + <dependency-list.file>direct-dependencies.txt</dependency-list.file> + </properties> + + <dependencyManagement> + <dependencies> + <!-- Note: If value in BOM conflicts with value inherited from + parent pom, inherited value takes precedence. This seems more like + a bug than a feature, but this is how maven 3.6 works --> + <dependency> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>dependencies-bom</artifactId> + <version>2.6.0-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>2.14.0-rc1</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-common</artifactId> + <version>${ccsdk.sli.core.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-provider</artifactId> + <version>${ccsdk.sli.core.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>dblib-provider</artifactId> + <version>${ccsdk.sli.core.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>aai-service-provider</artifactId> + <version>${ccsdk.sli.adaptors.version}</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-slf4j</artifactId> + <version>${logging-analytics.version}</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <version>${logging-analytics.version}</version> + </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-core</artifactId> + <version>4.4.2-nordix</version> + </dependency> + </dependencies> + </dependencyManagement> + + <repositories> + <repository> + <id>onap-public</id> + <url>${onap.nexus.public-url}</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>onap-staging</id> + <url>${onap.nexus.staging-url}</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>ecomp-release</id> + <name>onap-repository-releases</name> + <url>${onap.nexus.release-url}</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>ecomp-snapshot</id> + <name>onap-repository-snapshots</name> + <url>${onap.nexus.snapshot-url}</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>onap-public</id> + <url>${onap.nexus.public-url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>onap-staging</id> + <url>${onap.nexus.staging-url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>onap-snapshot</id> + <url>${onap.nexus.snapshot-url}</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + </pluginRepositories> + + <build> + <pluginManagement> + <plugins> + <!-- Plugins from ONAP oparent --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <!-- This version supports the "deployAtEnd" parameter --> + <version>2.8</version> + <configuration> + <skip/> + <deployAtEnd>true</deployAtEnd> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + <version>1.7</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>attach-descriptor</id> + <goals> + <goal>attach-descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <dependencies> + <dependency> + <groupId>org.onap.oparent</groupId> + <artifactId>checkstyle</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>check-license</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <configLocation>onap-checkstyle/check-license.xml</configLocation> + <headerLocation>onap-checkstyle/apache-license-2.regexp.txt</headerLocation> + <includeResources>false</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>false</includeTestResources> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <excludes> + </excludes> + <failsOnError>false</failsOnError> + <consoleOutput>true</consoleOutput> + </configuration> + </execution> + <execution> + <id>check-style</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml + with minor changes --> + <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> + <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> + <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory> + <includeResources>true</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>true</includeTestResources> + <excludes> + </excludes> + <failsOnError>false</failsOnError> + <consoleOutput>true</consoleOutput> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <!-- Sets the VM argument line used when unit tests are run. --> + <argLine>${surefireArgLine}</argLine> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.19.1</version> + <executions> + <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> + <execution> + <id>integration-tests</id> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <!-- Sets the VM argument line used when integration tests are run. --> + <argLine>${failsafeArgLine}</argLine> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compile.plugin.version}</version> + <configuration> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> + </configuration> + </plugin> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.6.0.1398</version> + </plugin> + + <!-- End of plugins from ONAP oparent --> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.client.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>${jersey.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>${apache.httpcomponents.core.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>${apache.httpcomponents.client.version}</version> + </additionalDependency> + <additionalDependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons.lang.version}</version> + </additionalDependency> + </additionalDependencies> + <failOnError>false</failOnError> + </configuration> + <executions> + <execution> + <id>aggregate</id> + <goals> + <goal>aggregate</goal> + </goals> + <phase>site</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <version>3.3.0</version> + <configuration> + <graphFormat>text</graphFormat> + <outputFileName>${dependency-list.file}</outputFileName> + <outputDirectory>${project.basedir}</outputDirectory> + <transitiveExcludes>*</transitiveExcludes> + <showVersions>true</showVersions> + <showGroupIds>true</showGroupIds> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <!-- Plugins from ONAP oparent --> + <!-- Jacoco / Sonar --> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco.version}</version> + <executions> + <execution> + <id>pre-unit-test</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile> + <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. --> + <propertyName>surefireArgLine</propertyName> + </configuration> + </execution> + <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. --> + <execution> + <id>post-unit-test</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + <execution> + <id>pre-integration-test</id> + <phase>pre-integration-test</phase> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile> + <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. --> + <propertyName>failsafeArgLine</propertyName> + </configuration> + </execution> + <!-- Ensures that the code coverage report for integration tests after integration tests have been run. --> + <execution> + <id>post-integration-test</id> + <phase>post-integration-test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> + </configuration> + </execution> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>default-report</id> + <phase>prepare-package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + <execution> + <id>default-check</id> + <goals> + <goal>check</goal> + </goals> + <configuration> + <rules> + <rule> + <element>PACKAGE</element> + <limits> + <limit> + <counter>COMPLEXITY</counter> + <value>COVEREDRATIO</value> + <minimum>0.0</minimum> + </limit> + </limits> + </rule> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.12</version> + </plugin> + <!-- Jacoco / Sonar --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + + <!-- End of plugins from ONAP oparent --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0.0</version> + <executions> + <execution> + <goals> + <goal>set-system-properties</goal> + </goals> + <configuration> + <properties> + <property> + <name>maven.wagon.http.ssl.allowall</name> + <value>${ssl.allowall}</value> + </property> + <property> + <name>maven.wagon.http.ssl.insecure</name> + <value>${ssl.insecure}</value> + </property> + </properties> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.5</version> + <configuration> + <processAllModules>true</processAllModules> + </configuration> + </plugin> + <plugin> + <artifactId>maven-scm-plugin</artifactId> + <version>1.8.1</version> + <configuration> + <tag>${project.artifactId}-${project.version}</tag> + </configuration> + </plugin> + <plugin> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <version>4.0.0</version> + <configuration> + <commitIdGenerationMode>full</commitIdGenerationMode> + <includeOnlyProperties> + <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty> + <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty> + </includeOnlyProperties> + </configuration> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + <excludePackageNames>org.opendaylight.*</excludePackageNames> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc-no-fork</report> + <report>test-javadoc-no-fork</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + <report>test-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <id>dual-report</id> + <configuration> + <type>range</type> + <range>30</range> + </configuration> + <reports> + <report>changelog</report> + <report>file-activity</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + </plugins> + </reporting> + + <profiles> + <!-- Profiles from ONAP oparent --> + <profile> + <id>generate-json</id> + <activation> + <file> + <exists>${swagger-properties}</exists> + </file> + <property> + <name>swagger-sdk.generate-json</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0.0</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/src/main/resources/swagger.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.kongchen</groupId> + <artifactId>swagger-maven-plugin</artifactId> + <version>3.1.4</version> + <configuration> + <apiSources> + <apiSource> + <locations>${api-rest-package}</locations> + <schemes>http,https</schemes> + <host>${api-host-ip}:${api-host-port}</host> + <basePath>${api-base-path}</basePath> + <info> + <title>${api-title}</title> + <version>${api-version}</version> + <description>${api-description}</description> + <license> + <name>${api-license}</name> + </license> + </info> + <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory> + </apiSource> + </apiSources> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <id>install-file-id</id> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${basedir}/src/main/resources/swagger.json</file> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}-swagger-schema</artifactId> + <version>${project.version}</version> + <packaging>json</packaging> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>generate-sdk</id> + <activation> + <file> + <exists>${swagger-json}</exists> + </file> + <property> + <name>swagger-sdk.generate-java-sdk</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-plugin.version}</version> + <executions> + <execution> + <phase>initialize</phase> + <id>ant-create-script</id> + <configuration> + <exportAntProperties>true</exportAntProperties> + <tasks> + <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/> + <condition property="is_windows" value="true"> + <os family="windows"/> + </condition> + <condition property="isLinux" value="true"> + <os family="unix"/> + </condition> + <if> + <equals arg1="${is_windows}" arg2="true"/> + <then> + <property name="swagger.sdk.script.file" value="generated-source-script.bat"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + </then> + <else> + <property name="swagger.sdk.script.file" value="generated-source-script.sh"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/> + </else> + </if> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>io.swagger</groupId> + <artifactId>swagger-codegen-maven-plugin</artifactId> + <version>2.2.1</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec> + <output>${project.build.directory}/generated-sources</output> + <language>java</language> + <configOptions> + <dateLibrary>joda</dateLibrary> + </configOptions> + <library>jersey2</library> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}-java-sdk</artifactId> + <artifactVersion>${project.version}</artifactVersion> + <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage> + <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage> + <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> + <executions> + <execution> + <id>swagger-generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>clean-generated-files</id> + <phase>generate-sources</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.build.directory}/generated-sources</directory> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.onap.msb.swagger-sdk</groupId> + <artifactId>swagger-sdk</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <!-- http://blog2.vorburger.ch/2016/06/improve-maven-build-speed-with-q.html + q = http://memory-alpha.wikia.com/wiki/Q ;) + + The Quick profile is used during incremental local development, when you want to "just get that JAR built", + which is very handy e.g. for fast hot reloading cycles in Karaf with bundle watch. It (intentionally!) skips + tests, quality checks etc. which are great and useful to run before finally submitting changes to Gerrit, and + which all must run on Gerrit, but which are overhead during ongoing fast iterative local development. + + Note that the idea here is that your IDE will already have run quality checks such as e.g. Checkstyle + while you typed the code anyway. Similarly, if you wrote a test, you'll probably already have compiled and run it + from your IDE, so when you want the OSGi bundle JAR for Karaf, ASAP, you typically don't want all that to run again. + --> + <id>q</id> + <properties> + <skipTests>true</skipTests> + <skipPush>true</skipPush> + <docker.skip.push>true</docker.skip.push> + <!-- But NOT <maven.test.skip>true, as that's for compiling, not running, tests; + and that's usually quick. Skipping test compilation with -Pq with maven.test.skip would be + particularly confusing when used in a project with maven-jar-plugin <goal>test-jar, so don't.) --> + <skipIT>true</skipIT> + <skipITs>true</skipITs> + <skip.karaf.featureTest>true</skip.karaf.featureTest> + <jacoco.skip>true</jacoco.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.source.skip>true</maven.source.skip> + <checkstyle.skip>true</checkstyle.skip> + <findbugs.skip>true</findbugs.skip> + <spotbugs.skip>true</spotbugs.skip> + <pmd.skip>true</pmd.skip> + <cpd.skip>true</cpd.skip> + <maven.site.skip>true</maven.site.skip> + <invoker.skip>true</invoker.skip> + <enforcer.skip>true</enforcer.skip> + <duplicate-finder.skip>true</duplicate-finder.skip> + <mdsal.skip.verbose>true</mdsal.skip.verbose> <!-- Bug 6236 --> + <maven.gitcommitid.skip>true</maven.gitcommitid.skip> + <modernizer.skip>true</modernizer.skip> + <format.skipExecute>true</format.skipExecute> + <format.skipValidate>true</format.skipValidate> + </properties> + </profile> + <profile> + <id>sonar-jacoco-aggregate</id> + <activation> + <property> + <name>onap.jacoco.aggregateFile</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>merge</id> + <goals> + <goal>merge</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <destFile>${onap.jacoco.aggregateFile}</destFile> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <includes> + <include>**/target/code-coverage/*.exec</include> + </includes> + </fileSet> + </fileSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <!-- End of profiles from ONAP oparent --> + </profiles> +</project> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot27/pom.xml index 504bc70a..1e7aa1bd 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot27/pom.xml @@ -2,18 +2,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk8.xml + <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk17.xml Any updates needed should be made to that template and not to the generated pom.xml file --> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>1.5.22.RELEASE</version> + <version>2.7.12</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>spring-boot-1-starter-parent</artifactId> + <artifactId>spring-boot-27-starter-parent</artifactId> <version>2.6.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -51,11 +51,9 @@ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- Jacoco properties --> - <jacoco.version>0.8.5</jacoco.version> + <jacoco.version>0.8.8</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- sitePath may be overridden in the inheriting POM if desired --> @@ -79,10 +77,9 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> - <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> + <java.version>17</java.version> + <maven.compile.plugin.version>3.10.0</maven.compile.plugin.version> + <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> @@ -92,53 +89,35 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version> <!-- Spring versions --> - <spring.boot.version>1.5.22.RELEASE</spring.boot.version> - <spring.version>4.3.25.RELEASE</spring.version> + <spring.boot.version>2.7.12</spring.boot.version> + <spring.version>5.3.27</spring.version> <!-- Kotlin versions --> - <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> - <kotlin.version>1.3.61</kotlin.version> - <kotlin.maven.version>1.3.61</kotlin.maven.version> - <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version> + <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget> + <kotlin.version>1.5.32</kotlin.version> + <kotlin.maven.version>1.5.32</kotlin.maven.version> + <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version> <kotlinpoet.version>1.5.0</kotlinpoet.version> <kroto-plus.version>0.5.0</kroto-plus.version> <nats.version>2.6.6</nats.version> <nats.streaming.version>2.2.3</nats.streaming.version> <mockk.version>1.9.3</mockk.version> + + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <!-- Managed dependency versions --> - <antlr.version>4.8-1</antlr.version> - <commons.lang.version>2.6</commons.lang.version> - <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version> - <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version> - <derby.version>10.14.2.0</derby.version> - <eelf.version>1.0.0</eelf.version> - <grpc.version>1.25.0</grpc.version> - <netty-ssl>2.0.39.Final</netty-ssl> - <protobuff.java.version>3.10.0</protobuff.java.version> - <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version> - <jersey.version>2.30.1</jersey.version> - <jersey.client.version>2.30.1</jersey.client.version> - <jettison.version>1.3.8</jettison.version> - <log4j.version>2.17.2</log4j.version> - <log4j2.version>2.17.2</log4j2.version> - <logback.version>1.2.11</logback.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> - <mariadb4j.version>2.4.0</mariadb4j.version> - <slf4j.version>1.7.25</slf4j.version> - <springfox.version>2.9.2</springfox.version> - <testng.version>6.14.3</testng.version> - <tomcat-jdbc.version>9.0.46</tomcat-jdbc.version> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -157,7 +136,7 @@ <dependency> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>2.11.4</version> + <version>2.14.2</version> <type>pom</type> <scope>import</scope> </dependency> @@ -203,16 +182,6 @@ <artifactId>liquibase-core</artifactId> <version>4.4.2-nordix</version> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -297,18 +266,7 @@ <enabled>true</enabled> </snapshots> </pluginRepository> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> </pluginRepositories> <build> @@ -418,7 +376,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> <configuration> <!-- Sets the VM argument line used when unit tests are run. --> <argLine>${surefireArgLine}</argLine> @@ -431,7 +388,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> <executions> <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. --> <execution> @@ -452,14 +408,16 @@ <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compile.plugin.version}</version> <configuration> - <source>${java.version.source}</source> - <target>${java.version.target}</target> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> </configuration> </plugin> <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.6.0.1398</version> + <version>3.7.0.1746</version> </plugin> <!-- End of plugins from ONAP oparent --> @@ -467,50 +425,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.2.0</version> <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${apache.httpcomponents.core.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${apache.httpcomponents.client.version}</version> - </additionalDependency> - <additionalDependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons.lang.version}</version> - </additionalDependency> - </additionalDependencies> <failOnError>false</failOnError> </configuration> <executions> @@ -892,7 +807,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> + <version>${maven-antrun-plugin.version}</version> <executions> <execution> <phase>initialize</phase> @@ -972,7 +887,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> + <version>3.1.0</version> <executions> <execution> <id>swagger-generate-sources</id> diff --git a/springboot/springboot30/pom.xml b/springboot/springboot30/pom.xml index b5b158a7..1da11227 100644 --- a/springboot/springboot30/pom.xml +++ b/springboot/springboot30/pom.xml @@ -89,10 +89,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -113,6 +113,10 @@ <nats.streaming.version>2.2.3</nats.streaming.version> <mockk.version>1.9.3</mockk.version> + + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <!-- Managed dependency versions --> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> |