Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update to MD-SAL APIs
[controller.git]
/
opendaylight
/
md-sal
/
pom.xml
diff --git
a/opendaylight/md-sal/pom.xml
b/opendaylight/md-sal/pom.xml
index 1ef55c6acc989fc6d289e21599009ef4a6b8df31..54fd0374114a3a35e7bd9eb2a3298dfafac20c33 100644
(file)
--- a/
opendaylight/md-sal/pom.xml
+++ b/
opendaylight/md-sal/pom.xml
@@
-12,21
+12,30
@@
</scm>
<modules>
</scm>
<modules>
+ <!-- Common APIs & Implementation -->
<module>sal-common</module>
<module>sal-common</module>
+ <module>sal-common-api</module>
+ <module>sal-common-impl</module>
<module>sal-common-util</module>
<module>sal-common-util</module>
+
<!-- Binding Independent -->
<module>sal-dom-api</module>
<module>sal-dom-broker</module>
<module>sal-dom-spi</module>
<!-- Binding Independent -->
<module>sal-dom-api</module>
<module>sal-dom-broker</module>
<module>sal-dom-spi</module>
+
<!-- Binding Aware -->
<module>sal-binding-api</module>
<module>sal-binding-broker</module>
<!-- Binding Aware -->
<module>sal-binding-api</module>
<module>sal-binding-broker</module>
+
<!-- Samples -->
<module>samples</module>
<!-- Samples -->
<module>samples</module>
+
<!-- Base Models -->
<module>model</module>
<!-- Base Models -->
<module>model</module>
+
<!-- Compability Packages -->
<module>sal-compability</module>
<!-- Compability Packages -->
<module>sal-compability</module>
+
<!-- Connectors -->
<module>sal-connector-api</module>
<module>sal-rest-connector</module>
<!-- Connectors -->
<module>sal-connector-api</module>
<module>sal-rest-connector</module>
@@
-45,8
+54,9
@@
<!-- Dependency Versions -->
<slf4j.version>1.7.2</slf4j.version>
<!-- Dependency Versions -->
<slf4j.version>1.7.2</slf4j.version>
- <yang.version>0.5.8</yang.version>
- <yang.codegen.version>0.5.8</yang.codegen.version>
+ <yang.version>0.5.9-SNAPSHOT</yang.version>
+ <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>
+ <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
<junit.version>4.8.1</junit.version>
<guava.version>14.0.1</guava.version>
<osgi.core.version>5.0.0</osgi.core.version>
<junit.version>4.8.1</junit.version>
@@
-65,6
+75,11
@@
<enabled>true</enabled>
</releases>
</pluginRepository>
<enabled>true</enabled>
</releases>
</pluginRepository>
+ <pluginRepository>
+ <id>opendaylight-snapshot</id>
+ <name>opendaylight-snapshot</name>
+ <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+ </pluginRepository>
<pluginRepository>
<id>opendaylight.release</id>
<name>opendaylight.release</name>
<pluginRepository>
<id>opendaylight.release</id>
<name>opendaylight.release</name>
@@
-132,7
+147,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>${yang.version}</version>
+ <version>${yang.
binding.
version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-206,7
+221,7
@@
<artifactId>maven-bundle-plugin</artifactId>
<version>${bundle.plugin.version}</version>
<extensions>true</extensions>
<artifactId>maven-bundle-plugin</artifactId>
<version>${bundle.plugin.version}</version>
<extensions>true</extensions>
- <executions>
+ <
!--
executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
@@
-214,7
+229,7
@@
<goal>manifest</goal>
</goals>
</execution>
<goal>manifest</goal>
</goals>
</execution>
- </executions>
+ </executions
--
>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
@@
-222,15
+237,6
@@
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <!-- Bundle OSGi Manifest created by maven-bundle-plugin into jar file -->
- <manifestFile>${project.basedir}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>