Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions to 4.0.0-SNAPSHOT
[netconf.git]
/
netconf
/
netconf-console
/
pom.xml
diff --git
a/netconf/netconf-console/pom.xml
b/netconf/netconf-console/pom.xml
index 1a6b9c29ae501d4f3e542438fa4455712c05db84..b8a9b85ceb5d5cae38f586377a49674f77c9debd 100644
(file)
--- a/
netconf/netconf-console/pom.xml
+++ b/
netconf/netconf-console/pom.xml
@@
-11,13
+11,11
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>
1.5
.0-SNAPSHOT</version>
- <relativePath>../
netconf-
parent</relativePath>
+ <version>
4.0
.0-SNAPSHOT</version>
+ <relativePath>../
../
parent</relativePath>
</parent>
</parent>
- <groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-console</artifactId>
<artifactId>netconf-console</artifactId>
- <version>1.5.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
@@
-26,48
+24,48
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${karaf.version}</version>
<scope>provided</scope>
</dependency>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.table</artifactId>
- <version>${karaf.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Project Dependencies -->
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
</dependency>
<dependency>
- <groupId>
org.mockito
</groupId>
- <artifactId>
mockito-core
</artifactId>
- <
scope>test</scope
>
+ <groupId>
com.guicedee.services
</groupId>
+ <artifactId>
javax.inject
</artifactId>
+ <
optional>true</optional
>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <scope>test</scope>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-test-util</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.
powermock
</groupId>
- <artifactId>
powermock-core
</artifactId>
+ <groupId>org.
opendaylight.mdsal
</groupId>
+ <artifactId>
mdsal-binding-test-utils
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.
opendaylight.yangtools
</groupId>
- <artifactId>
yang-test-util
</artifactId>
+ <groupId>org.
awaitility
</groupId>
+ <artifactId>
awaitility
</artifactId>
</dependency>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Karaf-Commands>*</Karaf-Commands>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
</project>