From 46751a7e8876ea31868f51be3e7f8c8f0dad0c87 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 19 Feb 2020 17:45:00 -0500 Subject: [PATCH] Refactoring parent root poms 1) dependency-odl-bom is being imported to other parent poms, removing / cleaning up duplicate dependencies 2) Adding spring-boot-setup pom and related templates for spring-boot parent poms 3) Adding jetty-server to dependency-odl-bom 4) Adding org.onap.logging-analytics dependency to spring-boot-parent poms Issue-ID: CCSDK-2107 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I3a844cd736044a4ffbca7688bca110c0bc7dab0c --- Readme.MD | 15 + dependencies-bom/pom.xml | 1 - dependencies-odl-bom/pom.xml | 7 +- odlparent/binding-parent/pom.xml | 128 +-- odlparent/bundle-parent/pom.xml | 128 +-- odlparent/feature-repo-parent/pom.xml | 128 +-- odlparent/karaf4-parent/pom.xml | 128 +-- odlparent/mdsal-it-parent/pom.xml | 128 +-- odlparent/odlparent-lite/pom.xml | 128 +-- odlparent/odlparent/pom.xml | 128 +-- .../setup/src/main/resources/pom-template.xml | 128 +-- odlparent/single-feature-parent/pom.xml | 128 +-- springboot/pom.xml | 1 + springboot/spring-boot-setup/pom.xml | 105 ++ .../src/main/properties/springboot1.properties | 5 + .../src/main/properties/springboot2.properties | 5 + .../src/main/resources/pom-template.xml | 1055 ++++++++++++++++++++ springboot/springboot1/pom.xml | 148 ++- springboot/springboot2/pom.xml | 80 +- 19 files changed, 1558 insertions(+), 1016 deletions(-) create mode 100644 Readme.MD create mode 100644 springboot/spring-boot-setup/pom.xml create mode 100644 springboot/spring-boot-setup/src/main/properties/springboot1.properties create mode 100644 springboot/spring-boot-setup/src/main/properties/springboot2.properties create mode 100644 springboot/spring-boot-setup/src/main/resources/pom-template.xml diff --git a/Readme.MD b/Readme.MD new file mode 100644 index 00000000..25b07196 --- /dev/null +++ b/Readme.MD @@ -0,0 +1,15 @@ +## !!!!! PLEASE READ !!!!! + +The actual parent poms are being generated from below two pom-template + +##### ODL related parent poms: +ccsdk/parent/odlparent/setup/src/main/template/pom-template.xml + +##### Springboot related parent poms: +ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template.xml + +#### Note: +Any updates needed should be made to respective template and not to the generated pom.xml file/files. + +Every parent pom has associated properties files (src/main/properties).
+Setup module will read those properties and populate respective values within generated pom.xml \ No newline at end of file diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 0d9b60bd..8a2c71b4 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -184,6 +184,5 @@ 6.14.3 - diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index af63f8f5..5c198fb4 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -386,6 +386,12 @@ 1.4.0 + + org.eclipse.jetty + jetty-server + 9.4.12.v20180830 + + org.eclipse.jetty jetty-servlet @@ -497,6 +503,5 @@ 1.25 - diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 58a0b427..26cdafc7 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 60469111..5d2a69b0 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index b7e932d3..97ec8427 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 374ac0ae..c1994e5d 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 2e386024..fc516e70 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 3f33d4f1..8c4fdb94 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 9bfb5b98..f0875b9c 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index bed42079..3bc3a13c 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + \${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + \${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version} - - \${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ \${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + \${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + \${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + \${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + \${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + \${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + \${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + \${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ \${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ \${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index a84150b5..944577c8 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -31,16 +31,15 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} - 3.7.0.1746 3.2 @@ -62,8 +61,6 @@ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/src/main/resources/swagger.properties @@ -141,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -162,11 +157,9 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE @@ -187,13 +180,11 @@ 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - @@ -204,51 +195,6 @@ pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - - io.netty - netty-transport - 4.1.34.Final - - - io.netty - netty-all - 4.1.34.Final - - - - junit - junit - 4.12 - test - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - org.onap.logging-analytics logging-slf4j @@ -260,13 +206,12 @@ ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -278,7 +223,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -291,7 +236,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -303,7 +248,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -314,7 +259,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -326,7 +271,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -407,9 +352,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -479,8 +422,6 @@ - - org.apache.maven.plugins maven-surefire-plugin @@ -628,8 +569,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -661,13 +601,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -690,13 +628,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -910,8 +846,7 @@ true - + @@ -921,31 +856,19 @@ - - + - - - + - - + @@ -1135,6 +1058,5 @@ - diff --git a/springboot/pom.xml b/springboot/pom.xml index 1772fdf5..5b7f69fe 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -16,6 +16,7 @@ ONAP :: ${project.groupId} :: ${project.artifactId} + spring-boot-setup springboot1 springboot2 diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml new file mode 100644 index 00000000..9709d212 --- /dev/null +++ b/springboot/spring-boot-setup/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + springboot-aggregator + 1.5.2-SNAPSHOT + + + org.onap.ccsdk.parent + spring-boot-setup + 1.5.2-SNAPSHOT + pom + + ONAP :: ${project.groupId} :: ${project.artifactId} + Root POM to be used in place of spring-boot parent for CCSDK based projects + http://wiki.onap.org + + + + + maven-resources-plugin + 2.6 + + + create-springboot1-parent-pom + + copy-resources + + validate + + ../springboot1 + + + src/main/resources + + pom-template.xml + + true + + + \ + + ${basedir}/src/main/properties/springboot1.properties + + + + + create-springboot2-parent-pom + + copy-resources + + validate + + ../springboot2 + + + src/main/resources + + pom-template.xml + + true + + + \ + + ${basedir}/src/main/properties/springboot2.properties + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + + rename-springboot1-parent-pom + validate + + rename + + + ../springboot1/pom-template.xml + ../springboot1/pom.xml + + + + rename-springboot2-parent-pom + validate + + rename + + + ../springboot2/pom-template.xml + ../springboot2/pom.xml + + + + + + + diff --git a/springboot/spring-boot-setup/src/main/properties/springboot1.properties b/springboot/spring-boot-setup/src/main/properties/springboot1.properties new file mode 100644 index 00000000..c4f4e011 --- /dev/null +++ b/springboot/spring-boot-setup/src/main/properties/springboot1.properties @@ -0,0 +1,5 @@ +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 \ No newline at end of file diff --git a/springboot/spring-boot-setup/src/main/properties/springboot2.properties b/springboot/spring-boot-setup/src/main/properties/springboot2.properties new file mode 100644 index 00000000..68a672b3 --- /dev/null +++ b/springboot/spring-boot-setup/src/main/properties/springboot2.properties @@ -0,0 +1,5 @@ +springbootparent.artifactId=spring-boot-starter-parent +springbootparent.groupId=org.springframework.boot +springbootparent.version=2.2.4.RELEASE +springboot.project.artifactId=spring-boot-starter-parent +spring.version=5.2.3.RELEASE \ No newline at end of file diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml new file mode 100644 index 00000000..e55d097b --- /dev/null +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -0,0 +1,1055 @@ + + + 4.0.0 + + + + ${springbootparent.groupId} + ${springbootparent.artifactId} + ${springbootparent.version} + + + + org.onap.ccsdk.parent + ${springboot.project.artifactId} + ${project.version} + pom + + ONAP :: \${project.groupId} :: \${project.artifactId} + Root POM to be used in place of spring-boot parent for CCSDK based projects + http://wiki.onap.org + + ONAP + + + + JIRA + https://jira.onap.org/ + + + + ecomp-releases + \${onap.nexus.release-url} + + + ecomp-snapshots + \${onap.nexus.snapshot-url} + + + + + + 3.7.0.1746 + 3.2 + jacoco + + \${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,\${project.reporting.outputDirectory}/jacoco-it/jacoco.xml + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + + 0.8.5 + + + 1.8 + 1.8 + UTF-8 + UTF-8 + https://nexus.onap.org + + /content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version} + + + \${basedir}/src/main/resources/swagger.properties + + \${basedir}/src/main/resources/swagger.json + + + + nexus.onap.org + 443 + https + https://nexus.onap.org/content/groups/public + https://nexus.onap.org/content/groups/staging + https://nexus.onap.org/content/repositories/releases + https://nexus.onap.org/content/repositories/snapshots + ecomp-staging + 176c31dfe190a + + 1.8 + 1.8 + 2.5.0 + 2.5.1 + features.xml + src/main/yang-gen-config + src/main/yang-gen-sal + true + + + 1.6.4 + + + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + + + ${springbootparent.version} + ${spring.version} + + + 1.8 + 1.3.61 + 1.3.61 + 1.3.3 + 1.5.0 + 0.5.0 + 2.6.6 + 2.2.3 + 1.9.3 + + + 4.7.2 + 2.6 + 4.4.12 + 4.5.10 + 10.14.2.0 + 1.0.0 + 1.25.0 + 3.10.0 + 3.10.0 + 3.1.5 + 2.25.1 + 2.25.1 + 1.3.8 + 1.2.3 + 2.4.4 + 2.4.0 + 1.7.25 + 6.11 + 9.0.27 + direct-dependencies.txt + + + + + + + org.onap.ccsdk.parent + dependencies-bom + ${project.version} + pom + import + + + org.onap.ccsdk.sli.core + sli-common + \${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + sli-provider + \${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + ccsdk-sli + \${ccsdk.sli.core.version} + xml + features + + + org.onap.ccsdk.sli.core + dblib-provider + \${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + \${ccsdk.sli.adaptors.version} + + + org.onap.logging-analytics + logging-slf4j + \${logging-analytics.version} + + + org.onap.logging-analytics + logging-filter-base + \${logging-analytics.version} + + + + + + + onap-public + \${onap.nexus.public-url} + + true + never + + + true + always + + + + onap-staging + \${onap.nexus.staging-url} + + true + never + + + true + always + + + + ecomp-release + onap-repository-releases + \${onap.nexus.release-url} + + true + never + + + false + + + + ecomp-snapshot + onap-repository-snapshots + \${onap.nexus.snapshot-url} + + false + + + true + + + + + + onap-public + \${onap.nexus.public-url} + + true + + + true + + + + onap-staging + \${onap.nexus.staging-url} + + true + + + true + + + + onap-snapshot + \${onap.nexus.snapshot-url} + + false + + + true + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + + Restlet + Restlet Repository + http://maven.restlet.com + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + 2.8 + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + org.apache.maven.doxia + doxia-core + 1.7 + + + org.apache.maven.doxia + doxia-sink-api + 1.7 + + + org.apache.maven.doxia + doxia-logging-api + 1.7 + + + + + attach-descriptor + + attach-descriptor + + + + + + maven-checkstyle-plugin + 2.17 + + + org.onap.oparent + checkstyle + 1.1.1 + + + + + check-license + + check + + process-sources + + onap-checkstyle/check-license.xml + onap-checkstyle/apache-license-2.regexp.txt + false + true + false + \${project.build.sourceDirectory} + + + false + true + + + + check-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + \${project.build.sourceDirectory}/src/main/java + true + true + true + + + false + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + \${surefireArgLine} + + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-tests + + integration-test + verify + + + + \${failsafeArgLine} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + \${maven.compile.plugin.version} + + \${java.version.source} + \${java.version.target} + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.6.0.1398 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + + org.slf4j + slf4j-api + \${slf4j.version} + + + org.antlr + antlr4 + \${antlr.version} + + + org.antlr + antlr4-runtime + \${antlr.version} + + + com.sun.jersey + jersey-client + \${jersey.client.version} + + + com.sun.jersey + jersey-core + \${jersey.version} + + + org.apache.httpcomponents + httpcore-osgi + \${apache.httpcomponents.core.version} + + + org.apache.httpcomponents + httpclient-osgi + \${apache.httpcomponents.client.version} + + + commons-lang + commons-lang + \${commons.lang.version} + + + + + + aggregate + + aggregate + + site + + + + + com.github.ferstl + depgraph-maven-plugin + 3.3.0 + + text + \${dependency-list.file} + \${project.basedir} + * + true + true + + + + + + + + + + org.jacoco + jacoco-maven-plugin + \${jacoco.version} + + + pre-unit-test + + prepare-agent + + + + \${project.build.directory}/code-coverage/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + \${project.build.directory}/code-coverage/jacoco-ut.exec + + \${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + \${project.build.directory}/code-coverage/jacoco-it.exec + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + \${project.build.directory}/code-coverage/jacoco-it.exec + + \${project.reporting.outputDirectory}/jacoco-it + + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + PACKAGE + + + COMPLEXITY + COVEREDRATIO + 0.0 + + + + + + + + + + maven-checkstyle-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + 1.12 + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + + set-system-properties + + + + + maven.wagon.http.ssl.allowall + \${ssl.allowall} + + + maven.wagon.http.ssl.insecure + \${ssl.insecure} + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + true + + + + maven-scm-plugin + 1.8.1 + + \${project.artifactId}-\${project.version} + + + + + + + + + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + org.opendaylight.* + + + + + javadoc-no-fork + test-javadoc-no-fork + + + + aggregate + + aggregate + test-aggregate + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + aggregate + + aggregate + test-aggregate + + + + + + maven-surefire-plugin + 2.17 + + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + dual-report + + range + 30 + + + changelog + file-activity + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + + + + generate-json + + + \${swagger-properties} + + + swagger-sdk.generate-json + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + \${basedir}/src/main/resources/swagger.properties + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.4 + + + + \${api-rest-package} + http,https + \${api-host-ip}:\${api-host-port} + \${api-base-path} + + \${api-title} + \${api-version} + \${api-description} + + \${api-license} + + + \${basedir}/src/main/resources + + + + + + compile + + generate + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + install-file-id + install + + install-file + + + \${basedir}/src/main/resources/swagger.json + \${project.groupId} + \${project.artifactId}-swagger-schema + \${project.version} + json + + + + + + + + + generate-sdk + + + \${swagger-json} + + + swagger-sdk.generate-java-sdk + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + initialize + ant-create-script + + true + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + io.swagger + swagger-codegen-maven-plugin + 2.2.1 + + + + generate + + + \${basedir}/src/main/resources/swagger.json + \${project.build.directory}/generated-sources + java + + joda + + jersey2 + \${project.groupId} + \${project.artifactId}-java-sdk + \${project.version} + \${project.groupId}.\${project.artifactId}.client.model + \${project.groupId}.\${project.artifactId}.client.api + \${project.groupId}.\${project.artifactId}.client.invoker + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + swagger-generate-sources + generate-sources + + exec + + + \${project.build.directory}\${file.separator}\${swagger.sdk.script.file} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + clean-generated-files + generate-sources + + clean + + + + + \${project.build.directory}/generated-sources + + + + + + + + + + + org.onap.msb.swagger-sdk + swagger-sdk + 1.0.0 + + + + + + q + + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + sonar-jacoco-aggregate + + + onap.jacoco.aggregateFile + + + + + + org.jacoco + jacoco-maven-plugin + + + merge + + merge + + generate-resources + + ${onap.jacoco.aggregateFile} + + + \${project.basedir} + + **/target/code-coverage/*.exec + + + + + + + + + + + + + diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index c5cb56cf..066c9dab 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -2,6 +2,9 @@ 4.0.0 + org.springframework.boot spring-boot-starter-parent @@ -15,7 +18,7 @@ pom ONAP :: ${project.groupId} :: ${project.artifactId} - Root POM to be used in place of odlparent for CCSDK based projects + Root POM to be used in place of spring-boot parent for CCSDK based projects http://wiki.onap.org ONAP @@ -28,11 +31,11 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} @@ -48,8 +51,8 @@ 0.8.5 - + 1.8 1.8 UTF-8 @@ -84,6 +87,8 @@ src/main/yang-gen-sal true + + 1.6.4 0.7.1-SNAPSHOT @@ -92,27 +97,50 @@ 0.7.1-SNAPSHOT 0.7.1-SNAPSHOT 0.7.1-SNAPSHOT - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} + + + 1.5.22.RELEASE + 4.3.25.RELEASE + + + 1.8 + 1.3.61 + 1.3.61 + 1.3.3 + 1.5.0 + 0.5.0 + 2.6.6 + 2.2.3 + 1.9.3 4.7.2 2.6 4.4.12 4.5.10 + 10.14.2.0 + 1.0.0 + 1.25.0 + 3.10.0 + 3.10.0 + 3.1.5 2.25.1 2.25.1 + 1.3.8 + 1.2.3 2.4.4 - + 2.4.0 + 1.7.25 + 6.11 + 9.0.27 direct-dependencies.txt - + org.onap.ccsdk.parent dependencies-bom @@ -125,7 +153,6 @@ sli-common ${ccsdk.sli.core.version} - org.onap.ccsdk.sli.core sli-provider @@ -138,26 +165,33 @@ xml features + + org.onap.ccsdk.sli.core + dblib-provider + ${ccsdk.sli.core.version} + org.onap.ccsdk.sli.adaptors aai-service-provider - ${sdnctl.aai.service.version} + ${ccsdk.sli.adaptors.version} - - org.onap.ccsdk.sli.core - dblib-provider - ${sdnctl.dblib.version} + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} + + + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} - - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -169,7 +203,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -182,7 +216,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -194,7 +228,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -251,7 +285,6 @@ - org.apache.maven.plugins @@ -262,7 +295,6 @@ - org.apache.maven.plugins maven-site-plugin @@ -338,8 +370,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -371,8 +402,7 @@ maven-failsafe-plugin 2.19.1 - + integration-tests @@ -424,7 +454,6 @@ antlr4-runtime ${antlr.version} - com.sun.jersey jersey-client @@ -452,7 +481,6 @@ - aggregate @@ -460,7 +488,6 @@ aggregate site - @@ -478,8 +505,8 @@ - + @@ -496,13 +523,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -525,13 +550,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -692,7 +715,6 @@ - maven-surefire-plugin 2.17 @@ -834,7 +856,6 @@ true - @@ -952,6 +973,47 @@ + + + q + + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + sonar-jacoco-aggregate diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 3ab11e68..662b3a9b 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -2,6 +2,9 @@ 4.0.0 + org.springframework.boot spring-boot-starter-parent @@ -15,7 +18,7 @@ pom ONAP :: ${project.groupId} :: ${project.artifactId} - Root POM to be used in place of odlparent for CCSDK based projects + Root POM to be used in place of spring-boot parent for CCSDK based projects http://wiki.onap.org ONAP @@ -28,11 +31,11 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} @@ -49,6 +52,7 @@ 0.8.5 + 1.8 1.8 UTF-8 @@ -83,6 +87,9 @@ src/main/yang-gen-sal true + + 1.6.4 + 0.7.1-SNAPSHOT 0.7.1-SNAPSHOT @@ -90,11 +97,6 @@ 0.7.1-SNAPSHOT 0.7.1-SNAPSHOT 0.7.1-SNAPSHOT - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} 2.2.4.RELEASE @@ -125,7 +127,6 @@ 2.25.1 2.25.1 1.3.8 - 4.12 1.2.3 2.4.4 2.4.0 @@ -137,6 +138,9 @@ + org.onap.ccsdk.parent dependencies-bom @@ -149,7 +153,6 @@ sli-common ${ccsdk.sli.core.version} - org.onap.ccsdk.sli.core sli-provider @@ -162,31 +165,33 @@ xml features + + org.onap.ccsdk.sli.core + dblib-provider + ${ccsdk.sli.core.version} + org.onap.ccsdk.sli.adaptors aai-service-provider - ${sdnctl.aai.service.version} + ${ccsdk.sli.adaptors.version} - - org.onap.ccsdk.sli.core - dblib-provider - ${sdnctl.dblib.version} + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} - junit - junit - ${junit.version} - test + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -198,7 +203,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -211,7 +216,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -223,7 +228,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -280,7 +285,6 @@ - org.apache.maven.plugins @@ -291,7 +295,6 @@ - org.apache.maven.plugins maven-site-plugin @@ -367,8 +370,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -400,8 +402,7 @@ maven-failsafe-plugin 2.19.1 - + integration-tests @@ -453,7 +454,6 @@ antlr4-runtime ${antlr.version} - com.sun.jersey jersey-client @@ -481,7 +481,6 @@ - aggregate @@ -489,7 +488,6 @@ aggregate site - @@ -507,8 +505,8 @@ - + @@ -525,13 +523,11 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -554,13 +550,11 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -721,7 +715,6 @@ - maven-surefire-plugin 2.17 @@ -863,7 +856,6 @@ true - -- 2.16.6