Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump MRI upstreams
[integration/distribution.git]
/
artifacts
/
distribution
/
pom.xml
diff --git
a/artifacts/distribution/pom.xml
b/artifacts/distribution/pom.xml
index 5688b114da7eb8c2b65719afc155dc05a9b5b46a..a9de0943de7c28645096e9f0b57bd6d4b078ec25 100644
(file)
--- a/
artifacts/distribution/pom.xml
+++ b/
artifacts/distribution/pom.xml
@@
-12,14
+12,16
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>
1.8.0-SNAPSHOT
</version>
+ <version>
8.0.3
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>distribution-artifacts</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.integration</groupId>
<artifactId>distribution-artifacts</artifactId>
- <version>0.
6
.0-SNAPSHOT</version>
+ <version>0.
14
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <name>distribution:distribution-artifacts</name>
+ <!-- <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 Integration/Distribution artifact versions.</description>
<url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
<licenses>
<description>POM to import with all Integration/Distribution artifact versions.</description>
<url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
<licenses>
@@
-36,38
+38,34
@@
<tag>HEAD</tag>
</scm>
<dependencyManagement>
<tag>HEAD</tag>
</scm>
<dependencyManagement>
+ <!-- TODO: Hardcode versions when moving to semantic versioning. -->
<dependencies>
<dependencies>
- <!--
Version
-->
+ <!--
Karaf 4 single features.
-->
<dependency>
<groupId>${project.groupId}</groupId>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>version</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>version</artifactId>
+ <artifactId>odl-integration-compatible-with-all</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
+ <classifier>features</classifier>
<type>xml</type>
<type>xml</type>
- <classifier>config</classifier>
</dependency>
</dependency>
- <!-- Karaf 3 features -->
<dependency>
<groupId>${project.groupId}</groupId>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
features-distribution
</artifactId>
+ <artifactId>
odl-integration-all
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <!-- Karaf 4 feature repositories. -->
<dependency>
<groupId>${project.groupId}</groupId>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>features-in
tegration-in
dex</artifactId>
+ <artifactId>features-index</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>features-
integration-
test</artifactId>
+ <artifactId>features-test</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>