X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=140a6ddfe128785edde35853eadac67ae698bcd0;hp=d42f1fd83d9a45fa4b24a97bf2445f9519206740;hb=ed458fab4af19a19d5ea52f91264e3e1467cf895;hpb=4b5f54e25c08fc21c955ff75901abe96b12d3340
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index d42f1fd83d..140a6ddfe1 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -91,17 +91,18 @@
0.1.2-SNAPSHOT
0.5.2-SNAPSHOT
0.5.0-SNAPSHOT
- 4.0.10.Final
+ 4.0.17.Final
2.4
0.4.2-SNAPSHOT
0.4.2-SNAPSHOT
- 0.5.1-SNAPSHOT
+ 0.6.0-SNAPSHOT
0.5.1-SNAPSHOT
0.5.1-SNAPSHOT
0.4.3-SNAPSHOT
0.4.2-SNAPSHOT
0.4.2-SNAPSHOT
0.4.2-SNAPSHOT
+ 0.4.3-SNAPSHOT
1.17
7.0.42
@@ -114,7 +115,9 @@
1.3.1
2.4.3
- ${project.build.directory}/generated-sources/xtend-gen
+ src/main/xtend-gen
+ src/main/yang-gen-config
+ src/main/yang-gen-sal
@@ -294,6 +297,12 @@
org.eclipse.equinox.launcher
1.3.0.v20120522-1813
+
+ xmlunit
+ xmlunit
+ 1.5
+ test
+
geminiweb
@@ -809,7 +818,7 @@
org.opendaylight.controller
clustering.services-implementation
- ${controller.version}
+ ${clustering.services_implementation.version}
org.opendaylight.controller
@@ -1318,6 +1327,11 @@
concepts
${concepts.version}
+
+ org.opendaylight.controller
+ sal-remoterpc-connector
+ ${mdsal.version}
+
@@ -1336,16 +1350,6 @@
yang-jmx-generator
${config.version}
-
- org.opendaylight.controller
- yang-store-api
- ${config.version}
-
-
- org.opendaylight.controller
- yang-store-impl
- ${config.version}
-
org.opendaylight.controller
logback-config
@@ -1356,31 +1360,16 @@
config-persister-api
${config.version}
-
- org.opendaylight.controller
- config-persister-file-adapter
- ${config.version}
-
org.opendaylight.controller
config-persister-file-xml-adapter
${config.version}
-
- org.opendaylight.controller
- config-persister-directory-adapter
- ${config.version}
-
org.opendaylight.controller
config-persister-directory-xml-adapter
${config.version}
-
- org.opendaylight.controller
- config-persister-directory-autodetect-adapter
- ${config.version}
-
org.opendaylight.controller
@@ -1486,7 +1475,16 @@
configuration
${configuration.version}
-
+
+ org.bouncycastle
+ bcprov-jdk15on
+ 1.50
+
+
+ org.bouncycastle
+ bcpkix-jdk15on
+ 1.50
+
@@ -1508,7 +1506,7 @@
opendaylight-snapshot
opendaylight-snapshot
- ${nexusproxy}/repositories/opendaylight.snapshot/
+ ${nexusproxy}/repositories/${nexus.repository.snapshot}/
true
@@ -1604,7 +1602,7 @@
opendaylight-snapshot
opendaylight-snapshot
- ${nexusproxy}/repositories/opendaylight.snapshot/
+ ${nexusproxy}/repositories/${nexus.repository.snapshot}/
true
@@ -1617,12 +1615,12 @@
opendaylight-release
- ${nexusproxy}/repositories/opendaylight.release/
+ ${nexusproxy}/repositories/${nexus.repository.release}/
opendaylight-snapshot
- ${nexusproxy}/repositories/opendaylight.snapshot/
+ ${nexusproxy}/repositories/${nexus.repository.snapshot}/
@@ -1727,7 +1725,7 @@
true
${project.basedir}
**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat
- **\/target\/,**\/bin\/,**\/target-ide\/
+ **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/
@@ -1765,6 +1763,7 @@
maven-surefire-plugin
${surefire.version}
+ ${testvm.argLine}
logback.configurationFile
@@ -1793,6 +1792,10 @@
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
@@ -1801,11 +1804,17 @@
maven-release-plugin
${releaseplugin.version}
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco.version}
+
org.opendaylight.yangtools
yang-maven-plugin
${yangtools.version}
+
org.eclipse.m2e
@@ -2008,6 +2017,52 @@
+
+ maven-clean-plugin
+
+
+
+ ${xtend.dstdir}
+
+ **
+
+
+
+ ${jmxGeneratorPath}
+
+ **
+
+
+
+ ${salGeneratorPath}
+
+ **
+
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.8
+
+
+ add-source
+ generate-sources
+
+ add-source
+
+
+
+
+
+
+
+
+
+
+