diff options
Diffstat (limited to 'odlparent/setup/src/main/resources/pom-template.xml')
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 92 |
1 files changed, 21 insertions, 71 deletions
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> |