Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump MRI upstreams
[openflowplugin.git]
/
openflowplugin-impl
/
pom.xml
diff --git
a/openflowplugin-impl/pom.xml
b/openflowplugin-impl/pom.xml
index 11b5e175f74b5159a778bc8bc97a28a940451570..bea91fa89c9ea02b7df5b88de7e6239b9790fab9 100644
(file)
--- a/
openflowplugin-impl/pom.xml
+++ b/
openflowplugin-impl/pom.xml
@@
-4,17
+4,26
@@
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
- <version>0.1
0
.0-SNAPSHOT</version>
+ <version>0.1
4
.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>openflowplugin-impl</artifactId>
<packaging>bundle</packaging>
<relativePath>../parent</relativePath>
</parent>
<artifactId>openflowplugin-impl</artifactId>
<packaging>bundle</packaging>
+ <properties>
+ <!-- FIXME: Remove this -->
+ <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
@@
-41,9
+50,13
@@
<artifactId>model-flow-statistics</artifactId>
</dependency>
<dependency>
<artifactId>model-flow-statistics</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
.model</groupId>
+ <groupId>org.opendaylight.
openflowplugin
.model</groupId>
<artifactId>model-inventory</artifactId>
</dependency>
<artifactId>model-inventory</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-common-netty</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-api</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-api</artifactId>
@@
-59,12
+72,6
@@
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>diagstatus-api</artifactId>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>diagstatus-api</artifactId>
- <version>${infrautils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin-annotation</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${project.groupId}.openflowjava</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}.openflowjava</groupId>
@@
-89,16
+96,10
@@
<optional>true</optional>
</dependency>
<dependency>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>
javax.inject
</groupId>
+ <groupId>
com.guicedee.services
</groupId>
<artifactId>javax.inject</artifactId>
<optional>true</optional>
</dependency>
<artifactId>javax.inject</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@
-112,10
+113,6
@@
<groupId>${project.groupId}.openflowjava</groupId>
<artifactId>openflow-protocol-impl</artifactId>
</dependency>
<groupId>${project.groupId}.openflowjava</groupId>
<artifactId>openflow-protocol-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-common</artifactId>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-common</artifactId>
@@
-124,15
+121,6
@@
<build>
<plugins>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin</artifactId>
- <configuration>
- <scanPaths>
- <scanPath>org.opendaylight.openflowplugin.impl</scanPath>
- </scanPaths>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>