From 5700b8593826798ef4f9d0356f852698c1c91bef Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 29 Jan 2021 12:38:52 -0500 Subject: Revert "ccsdk parents for alu-sr0" This reverts upgrade to OpenDaylight Aluminum (commit b6288f99fbfcc73f115511696f98111ca32b8d2f.) Change-Id: I194efd26f792328f0ab79848664708715e94e240 Issue-ID: CCSDK-3012 Signed-off-by: Dan Timoney --- odlparent/binding-parent/pom.xml | 297 +++++---------------- odlparent/bundle-parent/pom.xml | 297 +++++---------------- odlparent/client-parent/pom.xml | 51 +--- odlparent/feature-repo-parent/pom.xml | 297 +++++---------------- odlparent/karaf4-parent/pom.xml | 297 +++++---------------- odlparent/mdsal-it-parent/pom.xml | 297 +++++---------------- odlparent/odlparent-lite/pom.xml | 297 +++++---------------- odlparent/odlparent/pom.xml | 297 +++++---------------- odlparent/setup/pom.xml | 2 +- .../src/main/properties/binding-parent.properties | 2 +- .../src/main/properties/bundle-parent.properties | 2 +- .../main/properties/feature-repo-parent.properties | 2 +- .../src/main/properties/karaf4-parent.properties | 2 +- .../src/main/properties/mdsal-it-parent.properties | 2 +- .../src/main/properties/odlparent-lite.properties | 2 +- .../setup/src/main/properties/odlparent.properties | 2 +- .../properties/single-feature-parent.properties | 2 +- .../setup/src/main/resources/pom-template.xml | 297 +++++---------------- odlparent/single-feature-parent/pom.xml | 297 +++++---------------- 19 files changed, 558 insertions(+), 2184 deletions(-) (limited to 'odlparent') diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index ffedc52c..b75800e3 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.mdsal binding-parent - 6.0.7 + 4.0.17 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 3cd3257c..081691fe 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index cdf44089..c2427933 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -32,6 +32,8 @@ + 1.8 + 1.8 UTF-8 UTF-8 https://nexus.onap.org @@ -53,10 +55,9 @@ https://nexus.opendaylight.org/content/repositories/public/ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - 11 - 3.0.0-M5 - 3.0.0-M5 - 3.8.1 + 1.8 + 1.8 + 3.6.1 true @@ -65,7 +66,7 @@ - 4.13 + 4.11 2.8.9 1.18.0 0.8.10 @@ -348,46 +349,12 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.version} - ${java.version} - - - + ${java.version.source} + ${java.version.target} - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - ${surefireArgLine} - - - **/IT*.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - - integration-tests - - integration-test - verify - - - - ${failsafeArgLine} - - - - org.apache.maven.plugins maven-source-plugin diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index b35a7004..f228a576 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent feature-repo-parent - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 22a69362..bd98f4d3 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent karaf4-parent - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 9154a44c..c6018217 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.controller mdsal-it-parent - 2.0.6 + 1.10.4 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index ab1ac822..96978d04 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 1ace0d39..16550600 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent odlparent - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 6b5cdfaa..67111a8b 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -92,7 +92,7 @@ ${basedir}/src/main/properties/feature-repo-parent.properties - UTF-8 + UTF-8 diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index dd00c086..bf6cce1c 100644 --- a/odlparent/setup/src/main/properties/binding-parent.properties +++ b/odlparent/setup/src/main/properties/binding-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=binding-parent odlparent.groupId=org.opendaylight.mdsal -odlparent.version=6.0.7 +odlparent.version=4.0.17 diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index bbe4524f..43025bb0 100644 --- a/odlparent/setup/src/main/properties/bundle-parent.properties +++ b/odlparent/setup/src/main/properties/bundle-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=bundle-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index 97e5a281..955bdc8f 100644 --- a/odlparent/setup/src/main/properties/feature-repo-parent.properties +++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=feature-repo-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties index 0f8077d7..d5b0fe71 100644 --- a/odlparent/setup/src/main/properties/karaf4-parent.properties +++ b/odlparent/setup/src/main/properties/karaf4-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=karaf4-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index b3f808a5..75ebf4e0 100644 --- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties +++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=mdsal-it-parent odlparent.groupId=org.opendaylight.controller -odlparent.version=2.0.6 +odlparent.version=1.10.4 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index befd86c4..f2eda6d4 100644 --- a/odlparent/setup/src/main/properties/odlparent-lite.properties +++ b/odlparent/setup/src/main/properties/odlparent-lite.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent-lite odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index ca218faa..462906bc 100644 --- a/odlparent/setup/src/main/properties/odlparent.properties +++ b/odlparent/setup/src/main/properties/odlparent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index 362cd2b1..a43593f8 100644 --- a/odlparent/setup/src/main/properties/single-feature-parent.properties +++ b/odlparent/setup/src/main/properties/single-feature-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=single-feature-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=7.0.7 +odlparent.version=5.0.11 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 60e5fce7..c37ba4a8 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ \${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -191,26 +190,12 @@ parent pom, inherited value takes precedence. This seems more like a bug than a feature, but this is how maven 3.6 works --> - ${project.groupId} + org.onap.ccsdk.parent dependencies-odl-bom ${project.version} pom import - - ${project.groupId} - dependencies-bom - ${project.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 \${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - \${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - \${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - \${project.build.sourceDirectory} - + \${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - \${project.build.sourceDirectory}/src/main/java - + \${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/> + message="cd \${project.build.directory}\${file.separator}generated-sources\${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true\${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl \${salGeneratorPath} - true diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index c828e60e..4d1f66f6 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -8,7 +8,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.7 + 5.0.11 @@ -53,6 +53,8 @@ 0.8.5 + 8 + 8 UTF-8 UTF-8 https://nexus.onap.org @@ -81,17 +83,14 @@ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ UTF-8 - 11 - 3.0.0-M5 - 3.0.0-M5 - 4.2.1 - 3.8.1 + 8 + 8 + 2.5.0 + 2.5.1 features.xml src/main/yang-gen-config src/main/yang-gen-sal - 3.1.1 true - false 1.6.6 @@ -111,40 +110,40 @@ ${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.10.3 + 4.0.14 + 2.0.14 + 1.10.3 + 1.7.3 + 1.10.3 - 1.15 + 1.13 3.8.1 2.6 - 3.7 + 3.6 - 2.7.7 + 2.7.4 4.4.1 2.8.5 - 28.2-jre + 25.1-jre - 2.10.4 + 2.9.10 - 3.27.0-GA + 3.24.1-GA - 2.27 + 2.25.1 - 2.27 + 2.25.1 @@ -152,21 +151,21 @@ 20131018 - 4.13 + 4.12 - 1.11.6 + 1.2.3 - 3.3.3 + 1.10.19 - 4.1.51.Final + 4.1.42.Final - 1.7.29 + 1.7.25 4.3.25.RELEASE 0.6.4 - 4.8.1 + 4.7.2 1.0.0 @@ -180,7 +179,7 @@ 2.4.0 6.14.3 9.0.30 - 9.4.28.v20200408 + 9.4.12.v20180830 true direct-dependencies.txt @@ -197,20 +196,6 @@ pom import - - org.onap.ccsdk.parent - dependencies-bom - 2.1.1-SNAPSHOT - pom - import - - - org.springframework.boot - spring-boot-dependencies - 2.3.8.RELEASE - import - pom - org.onap.logging-analytics logging-slf4j @@ -230,14 +215,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - - - onap-public @@ -444,35 +421,35 @@ enforce-maven - enforce + enforce - - - 8 - - - [3.5.0,) - - + + + 8 + + + [3.5.0,) + + enforce-banned-dependencies - enforce + enforce - - - Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations - - org.mockito:mockito-all - - - - - true + + + Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations + + org.mockito:mockito-all + + + + + true @@ -484,11 +461,12 @@ ${sonar.scanner.version} + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 2.22.0 ${surefireArgLine} @@ -501,7 +479,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.version} + 2.22.0 @@ -594,143 +572,6 @@ false - - maven-checkstyle-plugin - - - process-sources - - check - - - false - false - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - - analyze-compile - compile - - check - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - - - com.github.spotbugs - spotbugs - 3.1.12 - compile - - - org.opendaylight.odlparent - spotbugs - 7.0.5 - compile - - - org.slf4j - slf4j-simple - 1.8.0-beta2 - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - false - true - spotbugs-exclude.xml - true - /home/jack/onap/onap-sdnr/features/sdnr/wt-aluminium-sr0-2/target/wt/common/target-ide/spotbugs - - - - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - org.onap.oparent - checkstyle - 1.2.2 - - - - - check-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - - - true - false - - - - onap-java-style - - check - - process-sources - - - onap-checkstyle/onap-java-style.xml - - - ${project.build.sourceDirectory}/src/main/java - - true - true - true - - - true - false - - - - @@ -743,24 +584,13 @@ org.apache.maven.plugins maven-site-plugin - maven-checkstyle-plugin - ${checkstyle.plugin.version} + 2.17 org.onap.oparent @@ -780,9 +610,7 @@ false true false - - ${project.build.sourceDirectory} - + ${project.build.sourceDirectory} true @@ -800,9 +628,7 @@ with minor changes --> onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory}/src/main/java - + ${project.build.sourceDirectory}/src/main/java true true true @@ -951,8 +777,7 @@ onap.nexus.url You must set a onap.nexus.url property in your - ~/.m2/settings.xml. See oparent/settings.xml for an example. - + ~/.m2/settings.xml. See oparent/settings.xml for an example. true @@ -1159,16 +984,16 @@ + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> + message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/> + message="mvn clean install -Dmaven.test.skip=true${line.separator}"/> @@ -1318,7 +1143,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 3.0.11 org.opendaylight.mdsal @@ -1347,12 +1172,10 @@ org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl ${salGeneratorPath} - true -- cgit 1.2.3-korg