diff options
author | Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-04-12 13:11:00 +0200 |
---|---|---|
committer | Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-05-27 07:17:00 +0200 |
commit | 67cb8d57527df08bd6997eb8b500ce31139016ce (patch) | |
tree | e9b4afc30bf56039d7a90a2f53682d3eac8f385e /odlparent | |
parent | 9714cfc592c9ca285bc0c70b659c024289690e6c (diff) |
migrate parents to silicon
actually silicon-SR0 but later for SR1
Issue-ID: CCSDK-3267
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I066e204dc9dc674c6c40e72fe7561dbdbc9cbe6a
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'odlparent')
17 files changed, 304 insertions, 106 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index d7c0f209..3c67eea1 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.mdsal</groupId> <artifactId>binding-parent</artifactId> - <version>6.0.7</version> + <version>7.0.6</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 61c87daf..7863de37 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bundle-parent</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 7062a854..1c92b029 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 086a0a1d..31897729 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>karaf4-parent</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 8c41b24e..2fada54d 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-it-parent</artifactId> - <version>2.0.6</version> + <version>3.0.7</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 4b157521..1c992c55 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>odlparent-lite</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 7c9cb071..ef46a0fa 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>odlparent</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> 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 @@ <sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index bea9eb12..4e83e955 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>single-feature-parent</artifactId> - <version>7.0.7</version> + <version>8.1.1</version> <relativePath/> </parent> @@ -111,12 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version> - <odl.mdsal.version>6.0.7</odl.mdsal.version> - <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.13.0</odl.controller.mdsal.version> + <odl.mdsal.version>7.0.6</odl.mdsal.version> + <odl.mdsal.model.version>7.0.6</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.13.0</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.13.1</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.13.0</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -125,7 +125,7 @@ <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> <commons.lang.version>2.6</commons.lang.version> <!-- Used by neutron; see also controller, vtn --> - <commons.net.version>3.7</commons.net.version> + <commons.net.version>3.8</commons.net.version> <!-- Used by neutron --> <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Used by aaa --> @@ -133,10 +133,10 @@ <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> <gson.version>2.8.5</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>28.2-jre</guava.version> + <guava.version>29.0-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.10.4</jackson.version> + <jackson.version>2.11.4</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -723,6 +723,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.gaul</groupId> + <artifactId>modernizer-maven-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>modernizer</id> + <phase>verify</phase> + <goals> + <goal>modernizer</goal> + </goals> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </execution> + </executions> + <configuration> + <failOnViolations>false</failOnViolations> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1320,7 +1342,7 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>5.0.5</version> + <version>6.0.5</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> |