Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use GuicedEE for javax.inject
[openflowplugin.git]
/
applications
/
arbitratorreconciliation
/
impl
/
pom.xml
diff --git
a/applications/arbitratorreconciliation/impl/pom.xml
b/applications/arbitratorreconciliation/impl/pom.xml
index c83e37e2eb46cddeb1ab2fa894bc42e0b3191ed5..ea35f72b4775ecdc3769a883e3d03a8b757062b1 100644
(file)
--- a/
applications/arbitratorreconciliation/impl/pom.xml
+++ b/
applications/arbitratorreconciliation/impl/pom.xml
@@
-1,12
+1,12
@@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<?xml version="1.0" encoding="UTF-8"?>
<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>
<parent>
- <artifactId>applications</artifactId>
<groupId>org.opendaylight.openflowplugin</groupId>
<groupId>org.opendaylight.openflowplugin</groupId>
- <version>0.8.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <artifactId>openflowplugin-parent</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ <relativePath>../../../parent</relativePath>
</parent>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>arbitratorreconciliation-impl</artifactId>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>arbitratorreconciliation-impl</artifactId>
@@
-16,18
+16,21
@@
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>arbitratorreconciliation-api</artifactId>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>arbitratorreconciliation-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.serviceutils</groupId>
<artifactId>upgrade</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.serviceutils</groupId>
<artifactId>upgrade</artifactId>
- <version>${serviceutils.version}</version>
</dependency>
<dependency>
</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>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin-annotation</artifactId>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin-annotation</artifactId>