Code Review
/
odlparent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump version to 6.0.1-SNAPSHOT
[odlparent.git]
/
odlparent-artifacts
/
pom.xml
diff --git
a/odlparent-artifacts/pom.xml
b/odlparent-artifacts/pom.xml
index d8bd644e7137eac702eb2b38014033c7aeec1c0c..f937595eca3e1f409d8e5dc57f05a873399b654d 100644
(file)
--- a/
odlparent-artifacts/pom.xml
+++ b/
odlparent-artifacts/pom.xml
@@
-7,7
+7,7
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>
4.0.3
-SNAPSHOT</version>
+ <version>
6.0.1
-SNAPSHOT</version>
<relativePath>../odlparent-lite/pom.xml</relativePath>
</parent>
<relativePath>../odlparent-lite/pom.xml</relativePath>
</parent>
@@
-37,16
+37,21
@@
<type>zip</type>
</dependency>
<type>zip</type>
</dependency>
+ <!-- BouncyCastle/Karaf/OSGi glue -->
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>
features-odlparen
t</artifactId>
+ <artifactId>
bcpkix-framework-ex
t</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>features-akka</artifactId>
+ <artifactId>bcprov-framework-ext</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>features-odlparent</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@
-137,42
+142,42
@@
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-
gson
</artifactId>
+ <artifactId>odl-
caffeine-2
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-
guava
</artifactId>
+ <artifactId>odl-
dropwizard-metrics
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-g
uava-25
</artifactId>
+ <artifactId>odl-g
son
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-
jackson-2.9
</artifactId>
+ <artifactId>odl-
guava
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-ja
vassist-3
</artifactId>
+ <artifactId>odl-ja
ckson-2.9
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-j
ersey-1
</artifactId>
+ <artifactId>odl-j
avassist-3
</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@
-258,6
+263,14
@@
<type>xml</type>
</dependency>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>odl-woodstox</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-ws-rs-api</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-ws-rs-api</artifactId>
@@
-273,7
+286,7
@@
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.
0
</version>
+ <version>3.1.
2
</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>