From 67cb8d57527df08bd6997eb8b500ce31139016ce Mon Sep 17 00:00:00 2001 From: Michael DÜrre Date: Mon, 12 Apr 2021 13:11:00 +0200 Subject: migrate parents to silicon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit actually silicon-SR0 but later for SR1 Issue-ID: CCSDK-3267 Signed-off-by: Michael DÜrre Change-Id: I066e204dc9dc674c6c40e72fe7561dbdbc9cbe6a Signed-off-by: Michael DÜrre --- .../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 | 42 ++++++++++++++++------ 9 files changed, 40 insertions(+), 18 deletions(-) (limited to 'odlparent/setup') diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index dd00c086..cd5ea63e 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=7.0.6 diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index bbe4524f..64871e83 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=8.1.1 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index 97e5a281..ba15958f 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=8.1.1 diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties index 0f8077d7..aaa4dd25 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=8.1.1 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index b3f808a5..958e757e 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=3.0.7 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index befd86c4..a75db88d 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=8.1.1 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index ca218faa..0de25438 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=8.1.1 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index 362cd2b1..d48089dc 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=8.1.1 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index fed8b410..b2deff05 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -111,12 +111,12 @@ \${ccsdk.sli.version} - 1.12.1 - 6.0.7 - 6.0.7 - 1.12.1 - 1.9.1 - 1.12.1 + 1.13.0 + 7.0.6 + 7.0.6 + 1.13.0 + 1.13.1 + 1.13.0 1.15 @@ -125,7 +125,7 @@ 2.6 - 3.7 + 3.8 2.7.7 @@ -133,10 +133,10 @@ 2.8.5 - 28.2-jre + 29.0-jre - 2.10.4 + 2.11.4 3.27.0-GA @@ -723,6 +723,28 @@ + + org.gaul + modernizer-maven-plugin + 2.1.0 + + + modernizer + verify + + modernizer + + + false + true + + + + + false + true + + @@ -1320,7 +1342,7 @@ org.opendaylight.yangtools yang-maven-plugin - 5.0.5 + 6.0.5 org.opendaylight.mdsal -- cgit 1.2.3-korg