diff options
author | Dan Timoney <dtimoney@att.com> | 2023-06-22 16:04:02 -0400 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2023-07-24 13:46:15 +0000 |
commit | 43836a9e53e965e6057ff08824d2cc4660a90049 (patch) | |
tree | 598521beb6f90ddecea792aaed160cf6348dc64a /odlparent | |
parent | 6ea1b9009ecc674b0e3000b7a50326908cdba711 (diff) |
Update parent poms for Argon release
Update versions in parent poms to match OpenDaylight Argon
release version SR1
Issue-ID: CCSDK-3914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I3249f682b6478d129f72c8f1e252e3ff84ce61c2
Diffstat (limited to 'odlparent')
17 files changed, 268 insertions, 169 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index ce171afd..1e483b6d 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>10.0.5</version> + <version>11.0.9</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index c459dd8d..ce2eac96 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 21a251e1..28eaa0e7 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 5a77c35e..22798684 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index baf68319..6edae8e6 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>6.0.5</version> + <version>7.0.6</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 492a90ef..e54a58a8 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 8659b420..8df58aa4 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index 4781d30a..7aa27ef9 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=10.0.5 +odlparent.version=11.0.9 diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index fa712023..b57ca686 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index d56da380..4cf1e180 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties index 28763f6d..9e272c89 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index 6d90cd14..c342554c 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=6.0.5 +odlparent.version=7.0.6 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index 6b44a499..11e0bd11 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index 31af8d23..72e04be9 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index ac782965..32996516 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=11.0.3 +odlparent.version=12.0.5 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 5a65bf1e..2893be73 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>\${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>\${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>\${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>\${junit.version}</version> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 8bcde43a..e47e0fdf 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>11.0.3</version> + <version>12.0.5</version> <relativePath/> </parent> @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version> - <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version> - <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version> - <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version> + <ccsdk.cds.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.cds.version> + <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version> + <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version> + <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version> <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> @@ -111,13 +111,12 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>10.0.5</odl.controller.mdsal.version> - <odl.mdsal.version>11.0.3</odl.mdsal.version> - <odl.mdsal.model.version>11.0.3</odl.mdsal.model.version> - <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> - <odl.netconf.restconf.version>10.0.5</odl.netconf.restconf.version> - <odl.netconf.netconf.version>10.0.5</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>10.0.5</odl.netconf.sal.rest.docgen.version> + <odl.mdsal.version>11.0.9</odl.mdsal.version> + <odl.mdsal.model.version>11.0.9</odl.mdsal.model.version> + <odl.mdsal.generator.version>11.0.9</odl.mdsal.generator.version> + <odl.netconf.restconf.version>5.0.6</odl.netconf.restconf.version> + <odl.netconf.netconf.version>5.0.6</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>5.0.6</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -132,20 +131,20 @@ <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> - <gson.version>2.10</gson.version> + <gson.version>2.10.1</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> <guava.version>31.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.13.4</jackson.version> + <jackson.version>2.14.2</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.29.2-GA</javassist.version> <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects --> <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit --> - <jersey.version>2.37</jersey.version> + <jersey.version>2.39.1</jersey.version> <!-- Used by sfc --> - <jersey.client.version>2.37</jersey.client.version> + <jersey.client.version>2.39.1</jersey.client.version> <!-- Used everywhere --> <junit.version>4.13.2</junit.version> @@ -154,7 +153,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.12.4</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.84.Final</netty.version> + <netty.version>4.1.91.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -162,7 +161,9 @@ <!-- Extra support libraries used by SDN-C --> <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> - <antlr.version>4.8-1</antlr.version> + <antlr.version>4.12.0</antlr.version> + <antlr4.version>4.12.0</antlr4.version> + <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version> @@ -225,6 +226,16 @@ <version>${logging-analytics.version}</version> </dependency> <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> |