Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions to 2.0.9-SNAPSHOT
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 77c18eb18362631de5845826007bc508b7ba5f6d..1c93fd7d1b9a4967b431cad2f408fa50269eb70e 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@
-1,89
+1,64
@@
<?xml version="1.0" encoding="UTF-8"?>
<?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">
+<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>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>
0.6.0
-SNAPSHOT</version>
- <relativePath>../
../config/config-
parent</relativePath>
+ <artifactId>
mdsal
-parent</artifactId>
+ <version>
2.0.9
-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-remoterpc-connector</artifactId>
<artifactId>sal-remoterpc-connector</artifactId>
- <version>1.5.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_
${scala.version}
</artifactId>
+ <artifactId>akka-actor_
2.13
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-cluster_
${scala.version}
</artifactId>
+ <artifactId>akka-cluster_
2.13
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-remote_
${scala.version}
</artifactId>
+ <artifactId>akka-remote_
2.13
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_
${scala.version}
</artifactId>
+ <artifactId>akka-testkit_
2.13
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-osgi_${scala.version}</artifactId>
+ <artifactId>akka-osgi_2.13</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_
${scala.version}
</artifactId>
+ <artifactId>akka-slf4j_
2.13
</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-persistence_
${scala.version}
</artifactId>
+ <artifactId>akka-persistence_
2.13
</artifactId>
</dependency>
<!-- SAL Dependencies -->
</dependency>
<!-- SAL Dependencies -->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-connector-api</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-spi</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-api</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-dom-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-common-impl</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-spi</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-108,49
+83,37
@@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- </dependency>
<!-- Test Dependencies -->
<dependency>
<!-- Test Dependencies -->
<dependency>
- <groupId>
junit
</groupId>
- <artifactId>
junit
</artifactId>
+ <groupId>
org.slf4j
</groupId>
+ <artifactId>
slf4j-simple
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-test-util</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-parser-impl</artifactId>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-akka-raft</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-164,63
+127,17
@@
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
- <Export-package></Export-package>
- <Private-Package></Private-Package>
+ <Export-package/>
<Import-Package>
<Import-Package>
- !org.iq80.*;
- !*snappy;
- !org.jboss.*;
- !com.jcraft.*;
- !org.fusesource.*;
- !*jetty*;
- !sun.security.*;
org.opendaylight.controller.cluster;
*
</Import-Package>
org.opendaylight.controller.cluster;
*
</Import-Package>
- <!--
- <Embed-Dependency>
- sal-clustering-commons;
- sal-akka-raft;
- *metrics*;
- !sal*;
- !*config-api*;
- !*testkit*;
- *protobuf*;
- akka*;
- *scala*;
- *config*;
- *netty*;
- *uncommons*;
- </Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- -->
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <!-- Turn off doclint. -->
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>