diff options
| author |   Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2022-01-18 10:06:31 +0100 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2022-03-22 13:08:35 +0000 |
| commit | 7bb133e401f31623104ecd3534e2aab3ffe72009 (patch) | |
| tree | 35b0115f52ec7d067cbae31c459a429de3bfb073 | |
| parent | cce01d4d7b326ec8283479f3ddf397a306b32a29 (diff) | |
migrate parents to phosphorus-sr1
generate sr1 parents and add script for this
Issue-ID: CCSDK-3565
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I53c5bed11d3d336df5ca99f521a210067663571d
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
27 files changed, 1533 insertions, 1928 deletions
@@ -18,6 +18,7 @@ workspace target target-ide MANIFEST.MF +**/__pycache__ ## Misc Ignores (OS specific etc) ## bin/ diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 61da66ba..7bad35df 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -23,12 +23,12 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency> <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> @@ -281,7 +281,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.7.3</version> + <version>2.7.5</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index ee150dd4..eb3cba4d 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -44,40 +44,40 @@ <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-artifacts</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>controller-artifacts</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-artifacts</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> <type>test-jar</type> <classifier>tests</classifier> <scope>test</scope> @@ -85,7 +85,7 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-test-model</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.java-websocket</groupId> @@ -141,6 +141,16 @@ <scope>import</scope> </dependency> <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.5</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.2.5</version> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.3.1</version> @@ -150,6 +160,12 @@ <artifactId>org.osgi.compendium</artifactId> <version>5.0.0</version> </dependency> + <dependency> + <groupId>org.dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>2.1.3</version> + </dependency> + <!-- Below is required by com.google.guava : guava : jar : 28.2-jre --> <dependency> <groupId>com.google.guava</groupId> diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index bfc116cc..d91bb6e9 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -21,44 +21,44 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.7</version> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-base</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>2.11.4</version> + <version>2.12.5</version> </dependency> <dependency> <groupId>com.fasterxml.woodstox</groupId> @@ -66,9 +66,9 @@ <version>6.2.6</version> </dependency> <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>classmate</artifactId> - <version>1.5.1</version> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + <version>1.4.4-7</version> </dependency> <dependency> <groupId>com.github.mifmif</groupId> @@ -83,7 +83,12 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.5</version> + <version>2.8.8</version> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1.1</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -93,12 +98,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>29.0-jre</version> - </dependency> - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - <version>1.1.1</version> + <version>30.1.1-jre</version> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -116,41 +116,6 @@ <version>9.2.0.jre8</version> </dependency> <dependency> - <groupId>com.oracle.database.jdbc</groupId> - <artifactId>ojdbc8</artifactId> - <version>21.1.0.0</version> - </dependency> - <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> - <version>5.12.0</version> - </dependency> - <dependency> - <groupId>com.thoughtworks.paranamer</groupId> - <artifactId>paranamer</artifactId> - <version>2.8</version> - </dependency> - <dependency> - <groupId>com.typesafe</groupId> - <artifactId>config</artifactId> - <version>1.4.0</version> - </dependency> - <dependency> - <groupId>com.typesafe</groupId> - <artifactId>ssl-config-core_2.13</artifactId> - <version>0.4.2</version> - </dependency> - <dependency> - <groupId>com.webcohesion.enunciate</groupId> - <artifactId>enunciate-core-annotations</artifactId> - <version>2.13.3</version> - </dependency> - <dependency> - <groupId>com.zaxxer</groupId> - <artifactId>HikariCP</artifactId> - <version>3.4.5</version> - </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.9.4</version> @@ -168,7 +133,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.8.0</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -186,6 +151,31 @@ <version>3.8.0</version> </dependency> <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + <version>21.1.0.0</version> + </dependency> + <dependency> + <groupId>com.rabbitmq</groupId> + <artifactId>amqp-client</artifactId> + <version>5.13.0</version> + </dependency> + <dependency> + <groupId>com.typesafe</groupId> + <artifactId>config</artifactId> + <version>1.4.0</version> + </dependency> + <dependency> + <groupId>com.typesafe</groupId> + <artifactId>ssl-config-core_2.13</artifactId> + <version>0.4.2</version> + </dependency> + <dependency> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP</artifactId> + <version>3.4.5</version> + </dependency> + <dependency> <groupId>dk.brics</groupId> <artifactId>automaton</artifactId> <version>1.12-1</version> @@ -193,37 +183,37 @@ <dependency> <groupId>io.aeron</groupId> <artifactId>aeron-client</artifactId> - <version>1.31.1</version> + <version>1.32.0</version> </dependency> <dependency> <groupId>io.aeron</groupId> <artifactId>aeron-driver</artifactId> - <version>1.31.1</version> + <version>1.32.0</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>4.1.21</version> + <version>4.1.25</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-graphite</artifactId> - <version>4.1.21</version> + <version>4.1.25</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-healthchecks</artifactId> - <version>4.1.21</version> + <version>4.1.25</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jmx</artifactId> - <version>4.1.21</version> + <version>4.1.25</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jvm</artifactId> - <version>4.1.21</version> + <version>4.1.25</version> </dependency> <dependency> <groupId>io.netty</groupId> @@ -233,47 +223,47 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-resolver</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-unix-common</artifactId> - <version>4.1.65.Final</version> + <version>4.1.69.Final</version> </dependency> <dependency> <groupId>io.prometheus</groupId> @@ -316,19 +306,9 @@ <version>1.2.2</version> </dependency> <dependency> - <groupId>jakarta.el</groupId> - <artifactId>jakarta.el-api</artifactId> - <version>4.0.0</version> - </dependency> - <dependency> - <groupId>jakarta.validation</groupId> - <artifactId>jakarta.validation-api</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.3.2</version> + <version>1.3.1</version> </dependency> <dependency> <groupId>javax.el</groupId> @@ -356,21 +336,10 @@ <version>1.4.7</version> </dependency> <dependency> - <groupId>javax.money</groupId> - <artifactId>money-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>javax.persistence-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> <groupId>javax.security.auth.message</groupId> <artifactId>javax.security.auth.message-api</artifactId> <version>1.1</version> </dependency> - <!-- TODO: Short Term fix, as 4.0.1 seems to have buggy MANIFEST.MF --> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -392,16 +361,6 @@ <version>2.1.1</version> </dependency> <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.6</version> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.9.7</version> - </dependency> - <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> <version>1.10.10</version> @@ -414,7 +373,7 @@ <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>2.10.6</version> + <version>2.10.9.2</version> </dependency> <dependency> <groupId>net.sf.jung</groupId> @@ -439,7 +398,7 @@ <dependency> <groupId>org.agrona</groupId> <artifactId>agrona</artifactId> - <version>1.8.0</version> + <version>1.9.0</version> </dependency> <dependency> <groupId>org.antlr</groupId> @@ -447,61 +406,6 @@ <version>4.9.2</version> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-osgi</artifactId> - <version>5.16.1</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.api</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.deployment.management</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.install</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.management</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.modeller</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolver.noop</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.api</artifactId> <version>1.0.1</version> @@ -552,61 +456,6 @@ <version>1.2.0</version> </dependency> <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.api</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.core</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.legacy.support</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.rmi</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi.url</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa.javax.persistence</groupId> - <artifactId>javax.persistence_2.1</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.api</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.blueprint</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.container</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.support</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> <version>1.1.3</version> @@ -614,7 +463,7 @@ <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.1.10</version> + <version>1.1.11</version> </dependency> <dependency> <groupId>org.apache.aries.quiesce</groupId> @@ -627,32 +476,12 @@ <version>1.3.2</version> </dependency> <dependency> - <groupId>org.apache.aries.subsystem</groupId> - <artifactId>org.apache.aries.subsystem.api</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.aries.subsystem</groupId> - <artifactId>org.apache.aries.subsystem.core</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.blueprint</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> <groupId>org.apache.aries.transaction</groupId> <artifactId>org.apache.aries.transaction.manager</artifactId> <version>1.3.3</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>4.4</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> <version>2.8.0</version> </dependency> @@ -672,56 +501,6 @@ <version>1.9</version> </dependency> <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-impl</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-data-module-api</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-data-module-impl</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-jpa-module-api</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-jpa-module-impl</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-partial-bean-module-api</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-partial-bean-module-impl</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-proxy-module-api</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-proxy-module-impl-asm5</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.14.2.0</version> @@ -749,7 +528,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin.plugin.interpolation</artifactId> - <version>1.1.2</version> + <version>1.1.4</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -769,12 +548,12 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.fileinstall</artifactId> - <version>3.6.8</version> + <version>3.7.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>6.0.4</version> + <version>6.0.5</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -784,7 +563,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> - <version>4.1.8</version> + <version>4.1.10</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -814,7 +593,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> - <version>2.1.26</version> + <version>2.1.28</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -848,11 +627,6 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.1_spec</artifactId> <version>1.0.1</version> </dependency> @@ -868,21 +642,11 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-el_1.0_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId> <version>1.0</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaspic_1.0_spec</artifactId> <version>1.1</version> </dependency> @@ -898,16 +662,6 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> <version>1.1.1</version> </dependency> @@ -922,304 +676,279 @@ <version>1.1</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.0_spec</artifactId> - <version>1.1</version> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka-clients</artifactId> + <version>2.6.0</version> </dependency> <dependency> <groupId>org.apache.karaf.audit</groupId> <artifactId>org.apache.karaf.audit.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.bundle</groupId> <artifactId>org.apache.karaf.bundle.blueprintstate</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.bundle</groupId> <artifactId>org.apache.karaf.bundle.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.config</groupId> <artifactId>org.apache.karaf.config.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.blueprint</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.features</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.kar</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.wrap</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.diagnostic</groupId> <artifactId>org.apache.karaf.diagnostic.boot</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.diagnostic</groupId> <artifactId>org.apache.karaf.diagnostic.core</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.karaf.docker</groupId> - <artifactId>org.apache.karaf.docker.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.command</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.extension</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.http</groupId> <artifactId>org.apache.karaf.http.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.instance</groupId> <artifactId>org.apache.karaf.instance.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas.blueprint</groupId> <artifactId>org.apache.karaf.jaas.blueprint.config</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas.blueprint</groupId> <artifactId>org.apache.karaf.jaas.blueprint.jasypt</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.boot</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.command</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.config</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.jasypt</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.modules</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.spring-security-crypto</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.jdbc</groupId> <artifactId>org.apache.karaf.jdbc.core</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.karaf.jms</groupId> - <artifactId>org.apache.karaf.jms.core</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.karaf.jndi</groupId> - <artifactId>org.apache.karaf.jndi.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.kar</groupId> <artifactId>org.apache.karaf.kar.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.log</groupId> <artifactId>org.apache.karaf.log.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.management</groupId> <artifactId>org.apache.karaf.management.server</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>manual</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.maven</groupId> <artifactId>org.apache.karaf.maven.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.obr</groupId> <artifactId>org.apache.karaf.obr.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>org.apache.karaf.client</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>org.apache.karaf.event</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.package</groupId> <artifactId>org.apache.karaf.package.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.profile</groupId> <artifactId>org.apache.karaf.profile.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.scheduler</groupId> <artifactId>org.apache.karaf.scheduler.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.scr</groupId> <artifactId>org.apache.karaf.scr.management</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.scr</groupId> <artifactId>org.apache.karaf.scr.state</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.service</groupId> <artifactId>org.apache.karaf.service.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.service</groupId> <artifactId>org.apache.karaf.service.guard</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.karaf.services</groupId> - <artifactId>org.apache.karaf.services.coordinator</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.services</groupId> <artifactId>org.apache.karaf.services.eventadmin</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.commands</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.console</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.ssh</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> - <version>4.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.karaf.subsystem</groupId> - <artifactId>org.apache.karaf.subsystem.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.system</groupId> <artifactId>org.apache.karaf.system.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.tooling</groupId> <artifactId>org.apache.karaf.tools.utils</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.console</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.features</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.gogo</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.http</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.instance</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.web</groupId> <artifactId>org.apache.karaf.web.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.karaf.wrapper</groupId> <artifactId>org.apache.karaf.wrapper.core</artifactId> - <version>4.3.2</version> + <version>4.3.3</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> @@ -1232,31 +961,6 @@ <version>2.3.3</version> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>3.1.2</version> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-el22</artifactId> - <version>1.7.6</version> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-impl</artifactId> - <version>1.7.6</version> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-spi</artifactId> - <version>1.7.6</version> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-web</artifactId> - <version>1.7.6</version> - </dependency> - <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.c3p0</artifactId> <version>0.9.5.5_1</version> @@ -1298,11 +1002,6 @@ </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.serp</artifactId> - <version>1.14.1_1</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.spring-security-crypto</artifactId> <version>5.3.3.RELEASE_2</version> </dependency> @@ -1347,16 +1046,6 @@ <version>2.9.0</version> </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.johnzon</artifactId> <version>1.2.6</version> @@ -1378,58 +1067,23 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm7-shaded</artifactId> - <version>4.16</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm8-shaded</artifactId> - <version>4.17</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> <artifactId>xbean-bundleutils</artifactId> - <version>4.19</version> + <version>4.20</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder</artifactId> - <version>4.19</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder-shaded</artifactId> - <version>4.16</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-naming</artifactId> - <version>4.19</version> + <version>4.20</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-reflect</artifactId> - <version>4.19</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.66</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>1.66</version> + <version>4.20</version> </dependency> <dependency> <groupId>org.checkerframework</groupId> <artifactId>checker-qual</artifactId> - <version>2.11.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.4.12</version> + <version>3.8.0</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> @@ -1437,14 +1091,9 @@ <version>4.2.1</version> </dependency> <dependency> - <groupId>org.dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>2.1.1</version> - </dependency> - <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.5.1</version> + <version>4.6.1</version> </dependency> <dependency> <groupId>org.eclipse.jdt</groupId> @@ -1459,207 +1108,167 @@ <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-common</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-hpack</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-server</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-alpn-server</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-continuation</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-deploy</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jaas</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jaspi</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jndi</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-proxy</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-xml</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-alpn</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-client-impl</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-client</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-common</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>9.4.40.v20210413</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> - <version>9.4.40.v20210413</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>javax.persistence</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.antlr</artifactId> - <version>2.7.8</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.asm</artifactId> - <version>2.7.8</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.core</artifactId> - <version>2.7.8</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.jpa</artifactId> - <version>2.7.8</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.jpa.jpql</artifactId> - <version>2.7.8</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.moxy</artifactId> - <version>2.7.7</version> + <version>9.4.43.v20210629</version> </dependency> <dependency> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.osgi</artifactId> - <version>3.16.200</version> - </dependency> - <dependency> - <groupId>org.fusesource.hawtbuf</groupId> - <artifactId>hawtbuf</artifactId> - <version>1.11</version> + <version>3.16.300</version> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> @@ -1697,16 +1306,6 @@ <version>1.0.1</version> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.el</artifactId> - <version>4.0.0</version> - </dependency> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> <version>2.27</version> @@ -1732,6 +1331,16 @@ <version>2.27</version> </dependency> <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-entity-filtering</artifactId> + <version>2.27</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-proxy-client</artifactId> + <version>2.27</version> + </dependency> + <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>2.27</version> @@ -1743,33 +1352,13 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-sse</artifactId> + <artifactId>jersey-media-json-jackson</artifactId> <version>2.27</version> </dependency> <dependency> - <groupId>org.hibernate.common</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>5.1.0.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>5.4.29.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-envers</artifactId> - <version>5.4.29.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-osgi</artifactId> - <version>5.4.29.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate.validator</groupId> - <artifactId>hibernate-validator</artifactId> - <version>7.0.1.Final</version> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-sse</artifactId> + <version>2.27</version> </dependency> <dependency> <groupId>org.hsqldb</groupId> @@ -1777,29 +1366,14 @@ <version>2.5.1</version> </dependency> <dependency> - <groupId>org.javamoney</groupId> - <artifactId>moneta</artifactId> - <version>1.1</version> - </dependency> - <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.27.0-GA</version> </dependency> <dependency> - <groupId>org.jboss.classfilewriter</groupId> - <artifactId>jboss-classfilewriter</artifactId> - <version>1.2.1.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jandex</artifactId> - <version>2.2.3.Final</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <version>3.4.1.Final</version> + <version>3.4.2.Final</version> </dependency> <dependency> <groupId>org.jboss.narayana.osgi</groupId> @@ -1807,16 +1381,6 @@ <version>5.10.6.Final</version> </dependency> <dependency> - <groupId>org.jboss.spec.javax.transaction</groupId> - <artifactId>jboss-transaction-api_1.2_spec</artifactId> - <version>1.1.1.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-osgi-bundle</artifactId> - <version>2.4.8.Final</version> - </dependency> - <dependency> <groupId>org.jboss.xnio</groupId> <artifactId>xnio-api</artifactId> <version>3.3.8.Final</version> @@ -1827,6 +1391,11 @@ <version>3.3.8.Final</version> </dependency> <dependency> + <groupId>org.jgrapht</groupId> + <artifactId>jgrapht-core</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> <groupId>org.jline</groupId> <artifactId>jline</artifactId> <version>3.19.0</version> @@ -1854,7 +1423,7 @@ <dependency> <groupId>org.jolokia</groupId> <artifactId>jolokia-osgi</artifactId> - <version>1.6.2</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -1862,6 +1431,11 @@ <version>20131018</version> </dependency> <dependency> + <groupId>org.lmdbjava</groupId> + <artifactId>lmdbjava</artifactId> + <version>0.7.0</version> + </dependency> + <dependency> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> <version>1.8.0</version> @@ -1869,2172 +1443,2162 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.7.3</version> - </dependency> - <dependency> - <groupId>org.messaginghub</groupId> - <artifactId>pooled-jms</artifactId> - <version>1.2.1</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-authn-api</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-cert</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-cli</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-encrypt-service</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-encrypt-service-impl</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-filterchain</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> + </dependency> + <dependency> + <groupId>org.opendaylight.aaa</groupId> + <artifactId>aaa-idm-store-h2</artifactId> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-password-service-api</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-password-service-impl</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-shiro</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-shiro-api</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> + </dependency> + <dependency> + <groupId>org.opendaylight.aaa</groupId> + <artifactId>aaa-tokenauthrealm</artifactId> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>repackaged-shiro</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>servlet-api</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>servlet-jersey2</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>web-api</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>web-osgi-impl</artifactId> - <version>0.13.5</version> + <version>0.14.7</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>algo-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>algo-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-benchmark-app</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-bmp-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-bmp-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-bmp-parser-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-bmp-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-cli</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-concepts</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-evpn</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-flowspec</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-inet</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-l3vpn</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-labeled-unicast</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-linkstate</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-mvpn</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-rp-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-rp-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-rp-statement</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-openconfig-state</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-parser-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-parser-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-parser-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-path-selection-mode</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-peer-acceptor</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-rib-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-rib-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-rib-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-route-target</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-topology-provider</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bmp-monitors-config-loader</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>concepts</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>config-loader-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>config-loader-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>data-change-counter</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>graph-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>graph-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-auto-bandwidth-extension</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-base-parser</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-cli</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-ietf-p2mp-te-lsp</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-ietf-stateful</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-segment-routing</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-server-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-server-provider</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-topology-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-topology-provider</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-topology-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-topology-stats</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-tunnel-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>pcep-tunnel-provider</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>programming-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>programming-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>programming-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>programming-topology-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>programming-tunnel-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>protocols-config-loader</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>routing-policy-config-loader</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>rsvp-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>rsvp-impl</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>rsvp-spi</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>topology-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>topology-config-loader</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>topology-segment-routing</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>topology-tunnel-api</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>util</artifactId> - <version>0.15.2</version> + <version>0.16.13</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>benchmark-api</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>blueprint</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-access-api</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-access-client</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-dom-api</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-mgmt-api</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>dsbenchmark</artifactId> - <version>3.0.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>messagebus-api</artifactId> - <version>3.0.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>messagebus-impl</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> - <artifactId>messagebus-spi</artifactId> - <version>3.0.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>messagebus-util</artifactId> - <version>3.0.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.controller.model</groupId> - <artifactId>model-inventory</artifactId> - <version>3.0.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.controller.model</groupId> - <artifactId>model-topology</artifactId> - <version>3.0.10</version> + <artifactId>eos-dom-akka</artifactId> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-event-executor-config</artifactId> - <version>0.14.10</version> + <version>0.15.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-threadgroup-config</artifactId> - <version>0.14.10</version> + <version>0.15.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-timer-config</artifactId> - <version>0.14.10</version> + <version>0.15.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>ntfbenchmark</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>repackaged-akka</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>rpcbenchmark</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-akka-raft</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-akka-segmented-journal</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-cluster-admin-api</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-cluster-admin-impl</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> + </dependency> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>sal-cluster-admin-karaf-cli</artifactId> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-clustering-commons</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-distributed-datastore</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> - <artifactId>sal-distributed-eos</artifactId> - <version>3.0.10</version> + <artifactId>sal-remoterpc-connector</artifactId> + <version>4.0.7</version> </dependency> <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>sal-remoterpc-connector</artifactId> - <version>3.0.10</version> + <groupId>org.opendaylight.controller.samples</groupId> + <artifactId>clustering-it-karaf-cli</artifactId> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>clustering-it-model</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>clustering-it-provider</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster-consumer</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster-provider</artifactId> - <version>3.0.10</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>threadpool-config-api</artifactId> - <version>0.14.10</version> + <version>0.15.7</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>threadpool-config-impl</artifactId> - <version>0.14.10</version> + <version>0.15.7</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-akka-infoprovider-impl</artifactId> - <version>1.9.2</version> + <version>1.10.1</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-impl</artifactId> - <version>1.9.2</version> + <version>1.10.1</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-model</artifactId> - <version>1.9.2</version> + <version>1.10.1</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-spi</artifactId> - <version>1.9.2</version> + <version>1.10.1</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>caches-api</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>caches-cli</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>caches-guava-impl</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>caches-impl-base</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>diagstatus-api</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>diagstatus-impl</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>diagstatus-shell</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>diagstatus-web</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>infrautils-util</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>inject</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>org.opendaylight.infrautils</groupId> - <artifactId>jobcoordinator-api</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>org.opendaylight.infrautils</groupId> - <artifactId>jobcoordinator-impl</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>metrics-api</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>metrics-impl</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>metrics-impl-prometheus</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>ready-api</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>ready-impl</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>org.opendaylight.infrautils</groupId> - <artifactId>shell</artifactId> - <version>1.9.9</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>bus-api</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>bus-jsonrpc</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>bus-messagelib</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>bus-spi</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>transport-http</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.bus</groupId> <artifactId>transport-zmq</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc</groupId> <artifactId>dom-codec</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc</groupId> <artifactId>jsonrpc-api</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc</groupId> <artifactId>jsonrpc-provider-common</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc</groupId> <artifactId>jsonrpc-provider-single</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.security</groupId> <artifactId>security-aaa</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.security</groupId> <artifactId>security-api</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.security</groupId> <artifactId>security-noop</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.jsonrpc.security</groupId> <artifactId>security-service</artifactId> - <version>1.10.2</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.api</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.config</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.dsbackend</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.implementation</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.inmemorydb</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.lisp-proto</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.mapcache</artifactId> - <version>1.13.3</version> - </dependency> - <dependency> - <groupId>org.opendaylight.lispflowmapping</groupId> - <artifactId>mappingservice.neutron</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.shell</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.lispflowmapping</groupId> <artifactId>mappingservice.southbound</artifactId> - <version>1.13.3</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.iana</groupId> <artifactId>iana-hardware</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.iana</groupId> <artifactId>iana-if-type</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.iana</groupId> <artifactId>iana-routing-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991-ietf-inet-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991-ietf-yang-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc7223</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc7277</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc7895</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc7952</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8294</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8294-ietf-routing-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8342</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8342-ietf-datastores</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8342-ietf-origin</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8343</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8344</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8345</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8345-ietf-network</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8345-ietf-network-state</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8345-ietf-network-topology</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8345-ietf-network-topology-state</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8346</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8346-ietf-l3-unicast-topology</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8346-ietf-l3-unicast-topology-state</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8348</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8348-ietf-hardware</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8348-ietf-hardware-state</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8349</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8349-ietf-routing</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8519</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8519-ietf-access-control-list</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8519-ietf-ethertypes</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8519-ietf-packet-fields</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8520</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8520-ietf-acldns</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8520-ietf-mud</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8525</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8528</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8529</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8530</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8542</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8542-ietf-dc-fabric-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8776</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8776-ietf-te-packet-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8776-ietf-te-types</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8795</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8795-ietf-te-topology</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc8795-ietf-te-topology-state</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-adapter</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec-osgi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec-spi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> - <artifactId>mdsal-binding-generator-api</artifactId> - <version>7.0.9</version> + <artifactId>mdsal-binding-generator</artifactId> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> - <artifactId>mdsal-binding-generator-impl</artifactId> - <version>7.0.9</version> + <artifactId>mdsal-binding-model-api</artifactId> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> - <artifactId>mdsal-binding-generator-util</artifactId> - <version>7.0.9</version> + <artifactId>mdsal-binding-model-ri</artifactId> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-runtime-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-runtime-osgi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-runtime-spi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-spec-util</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-spi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-util</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-common-api</artifactId> - <version>7.0.9</version> - </dependency> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>mdsal-common-util</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-broker</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-inmemory-datastore</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-schema-osgi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-spi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-binding-adapter</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-binding-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-common-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-common-spi</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-dom-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-dom-simple</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-replicate-common</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-replicate-netty</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-rfc8294-netty</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-singleton-common-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-singleton-dom-impl</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-trace-api</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-trace-cli</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-trace-impl</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-yanglib-api</artifactId> - <version>0.12.9</version> + <version>0.13.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-yanglib-rfc7895</artifactId> - <version>0.12.9</version> + <version>0.13.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-yanglib-rfc8525</artifactId> - <version>0.12.9</version> + <version>0.13.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>general-entity</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology</artifactId> - <version>2013.10.21.19.9</version> + <version>2013.10.21.20.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-type-util</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>opendaylight-l2-types</artifactId> - <version>2013.08.27.19.9</version> + <version>2013.08.27.20.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>yang-ext</artifactId> - <version>2013.09.07.19.9</version> + <version>2013.09.07.20.7</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>yang-binding</artifactId> - <version>7.0.9</version> + <version>8.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>aaa-authn-odl-plugin</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-model</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-protocol</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-provider</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-monitoring</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-monitoring-extension</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-nmda</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-notifications</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-with-defaults</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-restconf</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-restconf-monitoring</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> + </dependency> + <dependency> + <groupId>org.opendaylight.netconf</groupId> + <artifactId>ietf-yang-patch</artifactId> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-connector</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-impl</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-monitoring</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-notification</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-ssh</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-tcp</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-yang-library</artifactId> - <version>1.13.4</version> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>messagebus-netconf</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-api</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-auth</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-client</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-config</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-console</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-dom-api</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-impl</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-mapping-api</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-netty-util</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-notifications-api</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology-impl</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology-singleton</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-util</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-common</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-common-models</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-bierman02</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-rfc8040</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>sal-netconf-connector</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>sal-rest-docgen</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>shaded-exificient</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>shaded-sshd</artifactId> - <version>1.13.4</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>yanglib</artifactId> - <version>1.13.4</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>model</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>neutron-hostconfig-ovs</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>neutron-hostconfig-utils</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>neutron-hostconfig-vpp</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>neutron-spi</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>northbound-api</artifactId> - <version>0.16.2</version> - </dependency> - <dependency> - <groupId>org.opendaylight.neutron</groupId> - <artifactId>transcriber</artifactId> - <version>0.16.2</version> + <version>2.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bcpkix-framework-ext</artifactId> - <version>8.1.3</version> + <version>9.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bcprov-framework-ext</artifactId> - <version>8.1.3</version> + <version>9.0.8</version> + </dependency> + <dependency> + <groupId>org.opendaylight.odlparent</groupId> + <artifactId>bcutil-framework-ext</artifactId> + <version>9.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>karaf.branding</artifactId> - <version>8.1.3</version> + <version>9.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>logging-markers</artifactId> - <version>8.1.3</version> + <version>9.0.8</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>arbitratorreconciliation-api</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>arbitratorreconciliation-impl</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>bulk-o-matic</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>device-ownership-service</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>forwardingrules-manager</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>forwardingrules-sync</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>lldp-speaker</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>notification-supplier</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>of-switch-config-pusher</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>reconciliation-framework</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>southbound-cli</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>table-miss-enforcer</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>topology-lldp-discovery</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.applications</groupId> <artifactId>topology-manager</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>drop-test-karaf</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.libraries</groupId> <artifactId>liblldp</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.model</groupId> <artifactId>model-flow-base</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.model</groupId> <artifactId>model-flow-service</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.model</groupId> <artifactId>model-flow-statistics</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> + </dependency> + <dependency> + <groupId>org.opendaylight.openflowplugin.model</groupId> + <artifactId>model-inventory</artifactId> + <version>0.13.1</version> + </dependency> + <dependency> + <groupId>org.opendaylight.openflowplugin.model</groupId> + <artifactId>model-topology</artifactId> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowjava-extension-eric</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowjava-extension-nicira</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowjava-extension-nicira-api</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.openflowjava</groupId> <artifactId>openflowjava-blueprint-config</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.openflowjava</groupId> <artifactId>openflowjava-util</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.openflowjava</groupId> <artifactId>openflow-protocol-api</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.openflowjava</groupId> <artifactId>openflow-protocol-impl</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin.openflowjava</groupId> <artifactId>openflow-protocol-spi</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-api</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-blueprint-config</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-common</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-extension-api</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-extension-eric</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-extension-nicira</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-extension-onf</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>openflowplugin-impl</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.openflowplugin</groupId> <artifactId>test-common</artifactId> - <version>0.12.2</version> + <version>0.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>hwvtepsouthbound-api</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>hwvtepsouthbound-impl</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>library</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>schema.hardwarevtep</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>schema.openvswitch</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>southbound-api</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>southbound-impl</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.config</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.hwvtepsouthbound-utils</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.mdsal-utils</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.servicehelper</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.southbound-utils</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.ovsdb</groupId> <artifactId>utils.yang-utils</artifactId> - <version>1.12.2</version> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>listener-api</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>rpc-api</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>srm-api</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>srm-impl</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>srm-shell</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>tools-api</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.opendaylight.serviceutils</groupId> <artifactId>upgrade</artifactId> - <version>0.7.2</version> + <version>0.8.1</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce.ordmodels</groupId> + <artifactId>transportpce-ordmodels-common</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce.ordmodels</groupId> + <artifactId>transportpce-ordmodels-device</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce.ordmodels</groupId> + <artifactId>transportpce-ordmodels-network</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce.ordmodels</groupId> + <artifactId>transportpce-ordmodels-service</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-api</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-common</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-dmaap-client</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-inventory</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-nbinotifications</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-networkmodel</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-olm</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-pce</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-renderer</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-servicehandler</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-tapi</artifactId> + <version>4.1.0</version> + </dependency> + <dependency> + <groupId>org.opendaylight.transportpce</groupId> + <artifactId>transportpce-tapimodels</artifactId> + <version>4.1.0</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>concepts</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>odlext-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>odlext-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>openconfig-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>openconfig-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6241-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6241-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6536-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6536-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6643-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6643-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-data-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-data-util</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8040-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8040-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-data-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-data-util</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-model-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-parser-support</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> + </dependency> + <dependency> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>rfc8639-model-api</artifactId> + <version>7.0.9</version> + </dependency> + <dependency> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>rfc8639-parser-support</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>util</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-common</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-common-netty</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-binfmt</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-gson</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-xml</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-data-jaxen</artifactId> - <version>6.0.7</version> + <artifactId>yang-data-spi</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-transform</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-util</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-data-xpath-api</artifactId> - <version>0.4.7</version> + <artifactId>yang-model-api</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-model-api</artifactId> - <version>6.0.7</version> + <artifactId>yang-model-export</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-model-export</artifactId> - <version>6.0.7</version> + <artifactId>yang-model-ri</artifactId> + <version>7.0.9</version> + </dependency> + <dependency> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-model-spi</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-model-util</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-antlr</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-api</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-impl</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-reactor</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-rfc7950</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-spi</artifactId> - <version>6.0.7</version> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-xpath-antlr</artifactId> - <version>6.0.7</version> + <artifactId>yang-repo-api</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-xpath-api</artifactId> - <version>6.0.7</version> + <artifactId>yang-repo-fs</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-xpath-impl</artifactId> - <version>6.0.7</version> - </dependency> - <dependency> - <groupId>org.ops4j.base</groupId> - <artifactId>ops4j-base</artifactId> - <version>1.5.1</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-api</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-extender</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-extension</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-jetty-openwebbeans</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-jetty-weld</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-openwebbeans</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-spi</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-undertow-openwebbeans</artifactId> - <version>1.1.4</version> + <artifactId>yang-repo-spi</artifactId> + <version>7.0.9</version> </dependency> <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-undertow-weld</artifactId> - <version>1.1.4</version> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-xpath-antlr</artifactId> + <version>7.0.9</version> </dependency> <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-web</artifactId> - <version>1.1.4</version> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-xpath-api</artifactId> + <version>7.0.9</version> </dependency> <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-weld</artifactId> - <version>1.1.4</version> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-xpath-impl</artifactId> + <version>7.0.9</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> @@ -4127,69 +3691,19 @@ <version>1.5.0</version> </dependency> <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-activemq</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-api</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-artemis</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-config</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-ibmmq</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-oracleaq</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-pool-narayana</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-pool-pooledjms</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jms</groupId> - <artifactId>pax-jms-pool-transx</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jpa</groupId> - <artifactId>pax-jpa</artifactId> - <version>0.3.0</version> - </dependency> - <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-api</artifactId> - <version>2.0.14</version> + <version>2.0.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-log4j2</artifactId> - <version>2.0.14</version> + <version>2.0.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-logback</artifactId> - <version>2.0.14</version> + <version>2.0.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.tipi</groupId> @@ -4264,67 +3778,67 @@ <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-api</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-deployer</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-descriptor</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-war</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-whiteboard</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jetty</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jsp</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-resources-extender</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-resources-jsf</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-runtime</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-spi</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-tomcat</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-undertow</artifactId> - <version>7.3.16</version> + <version>7.3.19</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -4349,27 +3863,27 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>9.1</version> + <version>9.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-analysis</artifactId> - <version>9.1</version> + <version>9.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> - <version>9.1</version> + <version>9.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-tree</artifactId> - <version>9.1</version> + <version>9.2</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-util</artifactId> - <version>9.1</version> + <version>9.2</version> </dependency> <dependency> <groupId>org.owasp.encoder</groupId> @@ -4399,17 +3913,22 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.13.5</version> + <version>2.13.6</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-reflect</artifactId> - <version>2.13.5</version> + <version>2.13.6</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.29</version> + <version>1.7.32</version> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.7.3</version> </dependency> <dependency> <groupId>org.xerial</groupId> @@ -4423,7 +3942,7 @@ </dependency> </dependencies> </dependencyManagement> - + <build> <plugins> <plugin> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index d5305964..12f42217 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>7.0.9</version> + <version>8.0.7</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index ec8c4ba6..f1239685 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index c87689fd..6cae45cc 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 4e2f0f3b..25cd5d48 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 54b810cd..195afd55 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>3.0.10</version> + <version>4.0.7</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 9e9ef88e..ae861542 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 117961bb..9a67b8fb 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 4fc6b644..46db678a 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> + <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> <version>2.3.3-SNAPSHOT</version> </parent> diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index 32214ad3..028cbd09 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=7.0.9 +odlparent.version=8.0.7 diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index 931954e0..32f49b5d 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index c8dbd0a7..75eeeb12 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties index 31c96f10..9acf8462 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index 96c5adaf..7c2c8c69 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=3.0.10 +odlparent.version=4.0.7 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index 2ee94235..0641f528 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index 44d1a761..36fdf576 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index 4638a71a..37cae82c 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=8.1.3 +odlparent.version=9.0.8 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 7a348e8c..1ed33db6 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>\${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>\${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>\${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>\${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>\${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index c77377b5..73078410 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>8.1.3</version> + <version>9.0.8</version> <relativePath/> </parent> @@ -111,12 +111,13 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.13.4</odl.controller.mdsal.version> - <odl.mdsal.version>7.0.9</odl.mdsal.version> - <odl.mdsal.model.version>7.0.9</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.13.4</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.13.4</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.13.4</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>8.0.7</odl.controller.mdsal.version> + <odl.mdsal.version>9.0.8</odl.mdsal.version> + <odl.mdsal.model.version>9.0.8</odl.mdsal.model.version> + <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version> + <odl.netconf.restconf.version>8.0.7</odl.netconf.restconf.version> + <odl.netconf.netconf.version>8.0.7</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>8.0.7</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> <commons.codec.version>1.15</commons.codec.version> @@ -127,16 +128,16 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.8.0</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.8</eclipse.persistence.version> + <eclipse.persistence.version>None</eclipse.persistence.version> <!-- 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.8.5</gson.version> + <gson.version>2.8.8</gson.version> <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp --> - <guava.version>29.0-jre</guava.version> + <guava.version>30.1.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.11.4</jackson.version> + <jackson.version>2.12.5</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.27.0-GA</javassist.version> @@ -158,9 +159,9 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>3.3.3</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.65.Final</netty.version> + <netty.version>4.1.69.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> - <slf4j.version>1.7.29</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> <spring.version>4.3.25.RELEASE</spring.version> @@ -176,14 +177,13 @@ <derby.version>10.14.2.0</derby.version> <eelf.version>1.0.0</eelf.version> <grpc.version>1.21.1</grpc.version> - <jetty.version>9.4.40.v20210413</jetty.version> <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <jetty.version>9.4.43.v20210629</jetty.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <mariadb4j.version>2.4.0</mariadb4j.version> <testng.version>6.14.3</testng.version> <tomcat-jdbc.version>9.0.52</tomcat-jdbc.version> - <skip.karaf.featureTest>true</skip.karaf.featureTest> <dependency-list.file>direct-dependencies.txt</dependency-list.file> </properties> @@ -215,6 +215,11 @@ <type>pom</type> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.logging-analytics</groupId> <artifactId>logging-slf4j</artifactId> <version>${logging-analytics.version}</version> @@ -1276,61 +1281,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>yang-compile</id> - <activation> - <file> - <exists>src/main/yang</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>yang-maven-plugin</artifactId> - <version>6.0.6</version> - <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.opendaylight.netconf</groupId> - <artifactId>sal-rest-docgen-maven</artifactId> - <version>${odl.netconf.sal.rest.docgen.version}</version> - <type>jar</type> - </dependency> - </dependencies> - <executions> - <execution> - <id>binding</id> - <goals> - <goal>generate-sources</goal> - </goals> - <configuration> - <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> - <codeGenerators> - <generator> - <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> - <outputBaseDir>${salGeneratorPath}</outputBaseDir> - </generator> - <!-- - <generator> - <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass> - <outputBaseDir>target/swagger</outputBaseDir> - </generator> - --> - </codeGenerators> - <inspectDependencies>true</inspectDependencies> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </profiles> </project> diff --git a/oparent/pom.xml b/oparent/pom.xml index 02cada01..1ec378d3 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -79,7 +79,7 @@ <log4j.version>2.17.1</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <mariadb.connector.version>2.7.3</mariadb.connector.version> + <mariadb.connector.version>2.7.5</mariadb.connector.version> <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version> <velocity.version>2.3</velocity.version> <dmaap.listener.version>1.1.12</dmaap.listener.version> @@ -113,6 +113,11 @@ <version>${antlr.version}</version> </dependency> <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> <version>${sdc.client.version}</version> diff --git a/tools/README.md b/tools/README.md new file mode 100644 index 00000000..62a8520d --- /dev/null +++ b/tools/README.md @@ -0,0 +1,30 @@ +# CCSDK parent tools + +## migrateOdl.py + +This script tries to generate the ccsdk odl parents out of the existing odl parents and a downloaded and extracted odl folder. + +Usage + +``` +$ python3 tools/migrateOdlParents.py --src ~/Downloads/karaf-0.15.1 +``` + +args: + + * --src opendaylight source folder + * --group-id parent group-id to set (default=org.onap.ccsdk.parent) + * --version parent version to set + * --non-strict flag to stop on fail (default=True) + + +## mkbom.sh + +This script searches for all artifacts in the local odl repository folder $ODL_HOME/system and writes out of this a pom file. This is used to generate the installed-odl-bom/pom.xml. + +Usage: + +``` +$ cd ~/Downloads/opendaylight-15.0.0/system +$ ./your-path-to-odl-parents/tools/mkbom.sh your-group-id your-artifact-id your-version > /your-path-to-odl-parents/installed-odl-bom/pom.xml +```
\ No newline at end of file diff --git a/tools/lib/pomfile.py b/tools/lib/pomfile.py new file mode 100644 index 00000000..35dfd5a3 --- /dev/null +++ b/tools/lib/pomfile.py @@ -0,0 +1,109 @@ +import re +import tempfile +import tempfile +import glob +import shutil +from .xpath import XPath + +class PomFile: + + def __init__(self, filename): + self.filename=filename + + def hasParent(self) -> bool: + pattern_compiled = re.compile('<project[>\ ]') + inProject=False + with open(self.filename,'r') as src_file: + for line in src_file: + m = pattern_compiled.search(line) + if m is not None: + if inProject == True: + return True + inProject=True + pattern_compiled = re.compile('<parent[>\ ]') + return False + + + def setDependencyVersion(self, groupId, artifactId, version) -> bool: + return self.setXmlValue('/project/dependencies/dependency[groupId={},artifactId={}]/version'.format(groupId,artifactId),version) + def setDependencyManagementVersion(self, groupId, artifactId, version) -> bool: + return self.setXmlValue('/project/dependencyManagement/dependencies/dependency[groupId={},artifactId={}]/version'.format(groupId,artifactId),version) + # set xmlElementValue (just simple values - no objects) + # valuePath: xpath + # e.g. /project/parent/version + # /project/dependencies/dependency[groupId=org.opendaylight.netconf]/version + # value: value to set + def setXmlValue(self, valuePath, value, replaceMultiple=False) -> bool: + + found=False + pathToFind = XPath(valuePath) + pattern = re.compile('<([^>^\ ^?^!]+)') + curPath=XPath() + curParent=None + isComment=False + with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmp_file: + with open(self.filename) as src_file: + for line in src_file: + if found == False or replaceMultiple: + x=line.find('<!--') + y=line.find('-->') + if x>=0: + isComment=True + if y>=0 and y > x: + isComment=False + if not isComment: + matches = pattern.finditer(line,y) + for matchNum, match in enumerate(matches, 1): + f = match.group(1) + # end tag detected + if f.startswith("/"): + curPath.remove(f[1:]) + # start tag detected (not autoclosing xml like <br />) + elif not f.endswith("/"): + x = curPath.add(f) + if curParent is None: + curParent = x + else: + curParent = curPath.last(1) + else: + continue + if pathToFind.equals(curPath, False): + pre=line[0:line.index('<')] + line=pre+'<{x}>{v}</{x}>\n'.format(x=f,v=value) + found=True + curPath.remove(f) + break + elif pathToFind.parentParamIsNeeded(curPath.subpath(1), f): + v = self.tryToGetValue(line, f) + if v is not None: + curParent.setFilter(f, v) + + tmp_file.write(line) + # Overwrite the original file with the munged temporary file in a + # manner preserving file attributes (e.g., permissions). + shutil.copystat(self.filename, tmp_file.name) + shutil.move(tmp_file.name, self.filename) + print("set {} to {} in {}: {}".format(valuePath, value, self.filename, str(found))) + return found + + def tryToGetValue(self, line, xmlTag=None): + pattern = re.compile('<([^>^\ ^?^!]+)>([^<]+)<\/([^>^\ ^?^!]+)>' if xmlTag is None else '<('+xmlTag+')>([^<]+)<\/('+xmlTag+')>') + matches = pattern.finditer(line) + match = next(matches) + if match is not None: + return match.group(2) + return None + + @staticmethod + def findAll(folder, excludes=[]): + files= glob.glob(folder + "/**/pom.xml", recursive = True) + r=[] + for file in files: + doExclude=False + for exclude in excludes: + if exclude in file: + doExclude=True + break + if not doExclude: + r.append(file) + return r diff --git a/tools/lib/xpath.py b/tools/lib/xpath.py new file mode 100644 index 00000000..07f8e389 --- /dev/null +++ b/tools/lib/xpath.py @@ -0,0 +1,84 @@ + +import re + + +class XPathComponent: + regex = r"([^\/^\[]+)(\[([^\]]+)\])?" + def __init__(self, expr): + matches = re.finditer(XPathComponent.regex, expr, re.DOTALL | re.IGNORECASE) + match = next(matches) + self.name = match.group(1) + tmp = match.group(3) if len(match.groups())>2 else None + self.filter = tmp.split(',') if tmp is not None else [] + + def equals(self, comp, ignoreFilter=False) -> bool: + if ignoreFilter: + return self.name == comp.name + if self.name == comp.name: + return set(self.filter) == set(comp.filter) + return False + + def setFilter(self, f, v): + self.filter.append('{}={}'.format(f,v)) + + def hasFilter(self, propertyName): + search=propertyName+'=' + for filter in self.filter: + if filter.startswith(search): + return True + return False + + def __str__(self) -> str: + return "XPathComponent[name={}, filter={}]".format(self.name, self.filter) + +class XPath: + + def __init__(self, expr=None): + self.raw = expr + tmp = expr.split('/') if expr is not None else [] + self.components=[] + if len(tmp)>0 and len(tmp[0])==0: + tmp.pop(0) + for x in tmp: + self.components.append(XPathComponent(x)) + + def add(self, c: str) -> XPathComponent: + xc=XPathComponent(c) + self.components.append(xc) + return xc + + def remove(self, c: str) -> bool: + if self.components[len(self.components)-1].equals(XPathComponent(c), True): + self.components.pop() + return True + return False + + def parentParamIsNeeded(self, xp, paramName) -> bool: + for i in range(len(xp.components)): + if i>=len(self.components): + return False + if not self.components[i].equals(xp.components[i], True): + return False + return self.components[len(xp.components)-1].hasFilter(paramName) + + def equals(self, path, ignoreFilter=False) -> bool: + if len(self.components) != len(path.components): + return False + + for i in range(len(self.components)): + if not self.components[i].equals(path.components[i], ignoreFilter): + return False + return True + + def lastname(self) -> str: + tmp = self.last() + return tmp.name if tmp is not None else "" + + def last(self, off=0) -> XPathComponent: + return self.components[len(self.components)-1-off] if len(self.components)>off else None + + def subpath(self, off=0): + tmp =XPath() + for i in range(len(self.components)-off): + tmp.components.append(self.components[i]) + return tmp
\ No newline at end of file diff --git a/tools/migrateOdlParents.py b/tools/migrateOdlParents.py new file mode 100755 index 00000000..d46085f1 --- /dev/null +++ b/tools/migrateOdlParents.py @@ -0,0 +1,291 @@ +#!/usr/bin/python3 +import os +import argparse +import subprocess +import re +import shutil +import tempfile +from lib.pomfile import PomFile + +DEFAULT_PARENT_GROUPID="org.onap.ccsdk.parent" +DEFAULT_PARENT_VERSION="2.3.3-SNAPSHOT" +DEFAULT_STRICT=True +USE_OLD_SERVLET_API=True + +class OdlParentMigrator: + + def __init__(self,odlSourcePath, odlParentPath=None, groupId=DEFAULT_PARENT_GROUPID, version=DEFAULT_PARENT_VERSION, strict=DEFAULT_STRICT): + self.odlSourcePath=odlSourcePath + self.mvnbin = "/usr/bin/mvn" + self.version = version + self.groupId = groupId + self.strict = strict + if odlParentPath is None: + odlParentPath = os.path.abspath(os.path.dirname(os.path.realpath(__file__))+"/../odlparent") + self.odlParentPath=odlParentPath + self.parentPath =os.path.abspath(odlParentPath+'/../') + + + def getMvnRepoVersion(self, groupId, artifactId): + path="{}/system/{}/{}".format(self.odlSourcePath,groupId.replace('.','/'),artifactId) + if not os.path.exists(path): + return None + folders =[f for f in os.listdir(path) if os.path.isdir(os.path.join(path, f))] + if len(folders)<1: + return None + return folders[0] + + def getMvnRepoVersions(self, groupId, artifactId): + path="{}/system/{}/{}".format(self.odlSourcePath,groupId.replace('.','/'),artifactId) + if not os.path.exists(path): + return None + folders =[f for f in os.listdir(path) if os.path.isdir(os.path.join(path, f))] + if len(folders)<1: + return None + return folders + + def migrateInstalledOdlBom(self) -> bool: + success = True + print("migrating installed-odl-bom") + root=os.path.abspath(self.odlParentPath+'/..') + self.exec(('cd {src}/system && '+ + '{root}/tools/mkbom.sh {groupId} {artifactId} {version}> '+ + '{root}/installed-odl-bom/pom.xml && cd -').format( + root=root,src=self.odlSourcePath, + parent=self.odlParentPath,groupId=self.groupId, + artifactId='installed-odl-bom', version=self.version)) + if USE_OLD_SERVLET_API: + pom = PomFile('{}/installed-odl-bom/pom.xml'.format(root)) + success = pom.setDependencyManagementVersion('javax.servlet','javax.servlet-api','3.1.0') + + print("done") + return success + + def migrateDependenciesBom(self) -> bool: + success = True + print("migrating dependencies-bom") + + print("done" if success else "failed") + return success + + def migrateSetupProperties(self) -> bool: + success = True + print("migrating setup") + mdsalVersion=self.getMvnRepoVersion('org.opendaylight.mdsal','mdsal-binding-api') + odlBundleVersion=self.getMvnRepoVersion('org.opendaylight.odlparent','features-odlparent') + mdsalItVersion=self.getMvnRepoVersion('org.opendaylight.controller','features-controller') + yangVersion = self.getMvnRepoVersion('org.opendaylight.yangtools','yang-common') + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/binding-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(mdsalVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/bundle-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/feature-repo-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/karaf4-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/mdsal-it-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(mdsalItVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/odlparent-lite.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/odlparent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + self.replaceInFile(self.odlParentPath+'/setup/src/main/properties/single-feature-parent.properties', + 'odlparent.version=.*','odlparent.version={}'.format(odlBundleVersion)) + + + templatePom = PomFile(self.odlParentPath+'/setup/src/main/resources/pom-template.xml') + x = templatePom.setXmlValue('/project/properties/odl.controller.mdsal.version',mdsalVersion) + success = success and x + x = templatePom.setXmlValue('/project/properties/odl.mdsal.version',odlBundleVersion) + success = success and x + x = templatePom.setXmlValue('/project/properties/odl.mdsal.model.version',odlBundleVersion) + success = success and x + x = templatePom.setXmlValue('/project/properties/odl.netconf.restconf.version',mdsalVersion) + success = success and x + x = templatePom.setXmlValue('/project/properties/odl.netconf.netconf.version',mdsalVersion) + success = success and x + x = templatePom.setXmlValue('/project/properties/odl.netconf.sal.rest.docgen.version',mdsalVersion) + success = success and x + + x = templatePom.setXmlValue('/project/properties/commons.codec.version', + self.getMvnRepoVersion('commons-codec','commons-codec')) + success = success and x + x = templatePom.setXmlValue('/project/properties/commons.lang3.version', + self.getMvnRepoVersion('org.apache.commons','commons-lang3')) + success = success and x + x = templatePom.setXmlValue('/project/properties/commons.lang.version', + self.getMvnRepoVersion('commons-lang','commons-lang')) + success = success and x + x = templatePom.setXmlValue('/project/properties/commons.net.version', + self.getMvnRepoVersion('commons-net','commons-net')) + success = success and x + x = templatePom.setXmlValue('/project/properties/eclipse.persistence.version', + self.getMvnRepoVersion('org.eclipse.persistence','org.eclipse.persistence.core')) + success = success and x + x = templatePom.setXmlValue('/project/properties/gson.version', + self.getMvnRepoVersion('com.google.code.gson','gson')) + success = success and x + x = templatePom.setXmlValue('/project/properties/guava.version', + self.getMvnRepoVersion('com.google.guava','guava')) + success = success and x + x = templatePom.setXmlValue('/project/properties/jackson.version', + self.getMvnRepoVersion('com.fasterxml.jackson.core','jackson-core')) + success = success and x + x = templatePom.setXmlValue('/project/properties/javassist.version', + self.getMvnRepoVersion('org.javassist','javassist')) + success = success and x + x = templatePom.setXmlValue('/project/properties/jersey.version', + self.getMvnRepoVersion('org.glassfish.jersey.core','jersey-common')) + success = success and x + x = templatePom.setXmlValue('/project/properties/jersey.client.version', + self.getMvnRepoVersion('org.glassfish.jersey.core','jersey-client')) + success = success and x + x = templatePom.setXmlValue('/project/properties/org.json.version', + self.getMvnRepoVersion('org.json','json')) + success = success and x + x = templatePom.setXmlValue('/project/properties/netty.version', + self.getMvnRepoVersion('io.netty','netty-common')) + success = success and x + x = templatePom.setXmlValue('/project/properties/slf4j.version', + self.getMvnRepoVersion('org.slf4j','slf4j-api')) + success = success and x + x = templatePom.setXmlValue('/project/properties/derby.version', + self.getMvnRepoVersion('org.apache.derby','derby')) + success = success and x + x = templatePom.setXmlValue('/project/properties/jetty.version', + self.getMvnRepoVersion('org.eclipse.jetty','jetty-http')) + success = success and x + print("done" if success else "failed") + return success + + def migrateDependenciesOdlBom(self): + success = True + print("migrating dependencies-odl-bom") + bgpVersion = self.getMvnRepoVersion('org.opendaylight.bgpcep','topology-api') + controllerVersion = self.getMvnRepoVersion('org.opendaylight.controller', 'blueprint') + mdsalVersion=self.getMvnRepoVersion('org.opendaylight.mdsal','mdsal-binding-api') + netconfVersion = self.getMvnRepoVersion('org.opendaylight.netconf','ietf-netconf') + + pomFile = PomFile(os.path.abspath(self.parentPath+'/dependencies-odl-bom/pom.xml')) + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=bgp-artifacts]/version',bgpVersion) + success = success and x + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=controller-artifacts]/version',controllerVersion) + success = success and x + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=mdsal-artifacts]/version',mdsalVersion) + success = success and x + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=netconf-artifacts]/version',netconfVersion) + success = success and x + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=sal-binding-broker-impl]/version',netconfVersion, True) + success = success and x + # at the moment not possible because of dependent variable in path after value to set + # x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=sal-binding-broker-impl,type=test-jar]/version',netconfVersion) + # success = success and x + x = pomFile.setXmlValue('/project/dependencyManagement/dependencies/dependency[artifactId=sal-test-model]/version',netconfVersion) + success = success and x + print("done" if success else "failed") + return success + + def setParentValues(self): + print("setting all other parents") + # find all pom.xml files with parent to set + pomfiles=[os.path.abspath(self.parentPath+'/pom.xml'), + os.path.abspath(self.parentPath+'/dependencies-bom/pom.xml'), + os.path.abspath(self.odlParentPath+'/pom.xml'), + os.path.abspath(self.odlParentPath+'/setup/pom.xml'), + os.path.abspath(self.parentPath+'/springboot/pom.xml'), + os.path.abspath(self.parentPath+'/springboot/spring-boot-setup/pom.xml')] + + success=True + for file in pomfiles: + pomfile = PomFile(file) + if pomfile.hasParent(): + x = pomfile.setXmlValue('/project/parent/groupId',self.groupId) + success = success and x + x = pomfile.setXmlValue('/project/parent/version',self.version) + success = success and x + + # find all pom.xml files with groupId and version to set + pomfiles=PomFile.findAll(os.path.abspath(self.odlParentPath+'/..')) + for file in pomfiles: + pomfile = PomFile(file) + x = pomfile.setXmlValue('/project/groupId',self.groupId) + success = success and x + x = pomfile.setXmlValue('/project/version',self.version) + success = success and x + + # set only groupId for odl template + pomfile = PomFile(self.odlParentPath+'/setup/src/main/resources/pom-template.xml') + x = pomfile.setXmlValue('/project/groupId',self.groupId) + success = success and x + print("done" if success else "failed") + return success + + def execMaven(self, command): + print(self.execToStdOut(self.mvnbin,command)) + + + + + ''' + Perform the pure-Python equivalent of in-place `sed` substitution: e.g., + `sed -i -e 's/'${pattern}'/'${repl}' "${filename}"`. + ''' + def replaceInFile(self, filename, pattern, replacement): + + # For efficiency, precompile the passed regular expression. + pattern_compiled = re.compile(pattern) + + # For portability, NamedTemporaryFile() defaults to mode "w+b" (i.e., binary + # writing with updating). This is usually a good thing. In this case, + # however, binary writing imposes non-trivial encoding constraints trivially + # resolved by switching to text writing. Let's do that. + with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmp_file: + with open(filename) as src_file: + for line in src_file: + tmp_file.write(pattern_compiled.sub(replacement, line)) + + # Overwrite the original file with the munged temporary file in a + # manner preserving file attributes (e.g., permissions). + shutil.copystat(filename, tmp_file.name) + shutil.move(tmp_file.name, filename) + + def exec(self, bin, params=""): + output = subprocess.Popen( + bin+" "+params, shell=True, stdout=subprocess.PIPE).stdout.read() + return output + def execToStdOut(self, bin, params=""): + process = subprocess.Popen( + (bin+" "+params).split(' '), shell=False) + process.communicate() + + def run(self): + print("starting ONAP odl parent migration") + print("odl src={}".format(self.odlSourcePath)) + print("target ={}".format(self.odlParentPath)) + x = self.migrateInstalledOdlBom() + if self.strict and not x: + exit(1) + x = self.migrateDependenciesBom() + if self.strict and not x: + exit(1) + x = self.migrateDependenciesOdlBom() + if self.strict and not x: + exit(1) + x = self.migrateSetupProperties() + if self.strict and not x: + exit(1) + x = self.setParentValues() + if self.strict and not x: + exit(1) +# self.execMaven('clean install -f {}'.format(self.odlParentPath+'/setup')) +# self.execMaven('clean install -f {}'.format(self.parentPath)) + +parser = argparse.ArgumentParser(description='ONAP odl parent migration tool') +parser.add_argument('--src', type=str, required=True, help='the source folder where odl is located') +parser.add_argument('--group-id', type=str, required=False,default=DEFAULT_PARENT_GROUPID, help='groupid for the parents') +parser.add_argument('--version', type=str, required=False,default=DEFAULT_PARENT_VERSION, help='version') +parser.add_argument('--non-strict', action='store_false' if DEFAULT_STRICT else 'store_true', help='determine stopping script if something cannot be set') +args = parser.parse_args() + +migrator = OdlParentMigrator(args.src,None,args.group_id, args.version, args.non_strict) +migrator.run()
\ No newline at end of file |