<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<dependencyManagement>
<!-- TODO: Hardcode versions when moving to semantic versioning. -->
<dependencies>
- <!-- Idealy, only artifact artifacts should be needed. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>artifact-artifacts</artifactId>
<scope>import</scope>
<type>pom</type>
</dependency>
- <!-- TODO: All of the following should contain directions on how to get rid of their content. -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>feature-repo-artifacts</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>single-feature-artifacts</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>other-artifacts</artifactId>
<!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
<!-- Project artifact poms. Alphabetical order -->
<profiles>
+ <profile>
+ <id>aaa</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-artifacts</artifactId>
+ <version>${aaa.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
<profile>
<id>bgpcep</id>
<activation>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>config-artifacts</artifactId>
- <version>${config.version}</version>
+ <artifactId>controller-artifacts</artifactId>
+ <version>${controller.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
+ <profile>
+ <id>mdsal</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>${mdsal.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- FIXME: remove this with mdsal-6.0.1+ -->
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>odl-mdsal-trace</artifactId>
+ <version>${mdsal.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
<profile>
<id>netconf</id>
<activation>
</dependencies>
</dependencyManagement>
</profile>
+ <profile>
+ <id>odlparent</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>odlparent-artifacts</artifactId>
+ <version>${odlparent.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
<profile>
<id>openflowplugin</id>
<activation>
</dependencies>
</dependencyManagement>
</profile>
+ <profile>
+ <id>yangtools</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yangtools-artifacts</artifactId>
+ <version>${yangtools.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.opendaylight.integration</groupId>
- <artifactId>properties</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- <relativePath>../properties</relativePath>
- </parent>
- <artifactId>feature-repo-artifacts</artifactId>
- <packaging>pom</packaging>
- <!-- <name> formatting is used by autorelease to parse and notify projects on
- build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: integration :: ${project.artifactId}</name>
- <description>POM to import, with all upstream ODL user-facing feature repo artifact versions.</description>
- <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <!-- FIXME: Add developers section -->
- <scm>
- <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
- <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
- <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/feature-repos;hb=HEAD</url>
- <tag>HEAD</tag>
- </scm>
- <!-- TODO: Open Bugs against projects to export user-facing feature repository versions in artifact poms. -->
- <!-- User facing feature repositories. -->
- <profiles>
- <!-- AAA -->
- <profile>
- <id>aaa</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>features-aaa</artifactId>
- <version>${aaa.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- <!-- Controller -->
- <profile>
- <id>controller</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-extras</artifactId>
- <version>${controller.extras.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal</artifactId>
- <version>${controller.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-benchmark</artifactId>
- <version>${benchmark.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-trace</artifactId>
- <version>${controller.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- <!-- InfraUtils -->
- <profile>
- <id>infrautils</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>infrautils-features</artifactId>
- <version>${infrautils.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- <!-- ODL Parent -->
- <profile>
- <id>odlparent</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>features-odlparent</artifactId>
- <version>${odlparent.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
-</project>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream;hb=HEAD</url>
<tag>HEAD</tag>
</scm>
- <!-- TODO: Work towards using artifact-artifacts only. Properties, artifacts and all than can be joined to replace this pom. -->
<modules>
<module>properties</module>
<module>artifacts</module>
- <module>feature-repos</module>
- <module>single-features</module>
<module>other</module>
<module>all</module>
</modules>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<!-- Version properties by project or component. -->
<!-- Keep this list sorted alphabetically please. -->
<aaa.version>0.12.0-SNAPSHOT</aaa.version>
- <benchmark.version>1.9.0</benchmark.version>
<bgpcep.version>0.14.0-SNAPSHOT</bgpcep.version>
- <config.version>0.12.0</config.version>
- <controller.version>1.11.0</controller.version>
- <controller.extras.version>1.14.0</controller.extras.version>
+ <controller.version>2.0.0</controller.version>
<daexim.version>1.8.0-SNAPSHOT</daexim.version>
<genius.version>0.9.0-SNAPSHOT</genius.version>
<infrautils.version>1.8.0-SNAPSHOT</infrautils.version>
<jsonrpc.version>1.9.0-SNAPSHOT</jsonrpc.version>
<lispflowmapping.version>1.12.0-SNAPSHOT</lispflowmapping.version>
- <mdsal.version>5.0.9</mdsal.version>
+ <mdsal.version>6.0.0</mdsal.version>
<netconf.version>1.9.0-SNAPSHOT</netconf.version>
<netvirt.version>0.11.0-SNAPSHOT</netvirt.version>
<neutron.version>0.15.0-SNAPSHOT</neutron.version>
- <odlparent.version>6.0.4</odlparent.version>
+ <odlparent.version>7.0.1</odlparent.version>
<openflowplugin.version>0.11.0-SNAPSHOT</openflowplugin.version>
<ovsdb.version>1.11.0-SNAPSHOT</ovsdb.version>
<serviceutils.version>0.6.0-SNAPSHOT</serviceutils.version>
- <yangtools.version>4.0.6</yangtools.version>
+ <yangtools.version>5.0.1</yangtools.version>
<!-- Keep this list sorted alphabetically please. -->
</properties>
</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.opendaylight.integration</groupId>
- <artifactId>properties</artifactId>
- <version>0.13.0-SNAPSHOT</version>
- <relativePath>../properties</relativePath>
- </parent>
- <artifactId>single-feature-artifacts</artifactId>
- <packaging>pom</packaging>
- <!-- <name> formatting is used by autorelease to parse and notify projects on
- build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: integration :: ${project.artifactId}</name>
- <description>POM to import, with all upstream ODL user-facing single feature artifact versions.</description>
- <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <!-- FIXME: Add developers section -->
- <scm>
- <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
- <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
- <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/single-features;hb=HEAD</url>
- <tag>HEAD</tag>
- </scm>
- <!-- User facing single features. -->
- <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
- <profiles>
- <!-- AAA -->
- <profile>
- <id>aaa</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>odl-aaa-cert</artifactId>
- <version>${aaa.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>odl-aaa-shiro</artifactId>
- <version>${aaa.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- <!-- CONTROLLER -->
- <profile>
- <id>controller</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-mdsal-broker</artifactId>
- <version>${controller.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
-</project>
* - org.opendaylight.odlparent
- \*
- - 6.0.4
+ - 7.0.1
* - org.opendaylight.yangtools
- - yangtools-artifacts
- - 4.0.6
-
- * - org.opendaylight.mdsal
- - binding-parent
- - 5.0.9
+ - \*
+ - 5.0.1
* - org.opendaylight.mdsal
- - mdsal-artifacts
- - 5.0.9
+ - \*
+ - 6.0.0
* - org.opendaylight.controller
- - mdsal-artifacts
- - 1.11.0
+ - \*
+ - 2.0.0
* - org.opendaylight.aaa
- aaa-artifacts
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-extras</artifactId>
+ <artifactId>features-controller</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-benchmark</artifactId>
+ <artifactId>features-controller-experimental</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-trace</artifactId>
+ <artifactId>features-controller-testing</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
</dependency>
</dependencies>
</profile>
- <!-- FIXME: Add Mdsal -->
+ <!-- Mdsal -->
+ <profile>
+ <id>mdsal</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>features-mdsal</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+ </profile>
<!-- Netconf -->
<profile>
<id>netconf</id>
</dependency>
</dependencies>
</profile>
+ <!-- Yangtools -->
+ <profile>
+ <id>yangtools</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>features-yangtools</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>opendaylight-karaf4-empty</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>opendaylight-karaf-empty</artifactId>
- </exclusion>
<exclusion>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>opendaylight-karaf-empty</artifactId>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>opendaylight-karaf4-empty</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>opendaylight-karaf-empty</artifactId>
- </exclusion>
<exclusion>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>opendaylight-karaf-empty</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<!-- Controller -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-extras</artifactId>
+ <artifactId>features-controller</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal</artifactId>
+ <artifactId>features-controller-experimental</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+
+ <!-- Daexim -->
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-benchmark</artifactId>
+ <groupId>org.opendaylight.daexim</groupId>
+ <artifactId>daexim-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+
+ <!-- MD-SAL -->
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-trace</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>features-mdsal</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <!-- Daexim -->
+ <!-- MD-SAL Trace -->
+ <!-- FIXME: remove this with mdsal-6.0.1+ -->
<dependency>
- <groupId>org.opendaylight.daexim</groupId>
- <artifactId>daexim-features</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>odl-mdsal-trace</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<profile>
<id>transportpce</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>6.0.4</version>
+ <version>7.0.1</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>