From 50b2f9cfb4001418d4d0ae8d2f330e1ff889cd8d Mon Sep 17 00:00:00 2001 From: Vaishali Mithbaokar Date: Wed, 9 Apr 2014 18:39:04 -0700 Subject: [PATCH] bug 1128:POM Restructuring for Automated Release Temporarily hosting odlrootparent as part of the project just for review purpose Change-Id: Ia9f14f1f5544e3ef5a543cf8e0e904fb31ffbeee Signed-off-by: Surekha Bejgam Signed-off-by: Vaishali Mithbaokar Signed-off-by: Robert Varga --- .../binding-java-api-generator/pom.xml | 9 + .../maven-sal-api-gen-plugin/pom.xml | 3 +- code-generator/pom.xml | 8 +- .../samples/maven-code-gen-sample/pom.xml | 46 +- .../samples/modeling-sample/pom.xml | 47 +- common/checkstyle-logging/pom.xml | 13 +- common/concepts/pom.xml | 5 +- common/feature/pom.xml | 3 +- common/mockito-configuration/pom.xml | 4 +- common/object-cache-api/pom.xml | 4 +- common/object-cache-guava/pom.xml | 4 +- common/object-cache-noop/pom.xml | 3 +- common/parent/pom.xml | 745 ++++++++++++++++++ common/pom.xml | 31 +- common/util/pom.xml | 3 +- integration-test/bug527-test-model/pom.xml | 28 +- integration-test/bundle-test/pom.xml | 74 +- integration-test/pom.xml | 81 +- .../regression-test-model/pom.xml | 13 +- integration-test/test-models/pom.xml | 3 +- integration-test/yang-runtime-tests/pom.xml | 12 +- model/iana/iana-afn-safi/pom.xml | 1 + model/iana/iana-if-type/pom.xml | 1 + model/iana/pom.xml | 1 + model/ietf/ietf-inet-types/pom.xml | 3 + model/ietf/ietf-netconf/pom.xml | 2 +- model/ietf/ietf-restconf/pom.xml | 1 + model/ietf/ietf-ted/pom.xml | 1 + model/ietf/ietf-topology-isis/pom.xml | 1 + .../ietf/ietf-topology-l3-unicast-igp/pom.xml | 2 + model/ietf/ietf-topology-ospf/pom.xml | 1 + model/ietf/ietf-topology/pom.xml | 1 - model/ietf/pom.xml | 12 +- model/l2-types/pom.xml | 1 + model/pom.xml | 59 +- model/yang-ext/pom.xml | 3 +- pom.xml | 396 +--------- restconf/pom.xml | 152 +--- restconf/restconf-client-api/pom.xml | 2 +- restconf/restconf-client-impl/pom.xml | 10 +- restconf/restconf-common/pom.xml | 1 + restconf/restconf-jaxrs-api/pom.xml | 1 - restconf/restconf-test-service/pom.xml | 16 +- restconf/restconf-util/pom.xml | 1 + third-party/antlr4-runtime-osgi/pom.xml | 7 +- third-party/pom.xml | 66 +- third-party/xtend-lib-osgi/pom.xml | 6 +- websocket/pom.xml | 19 +- websocket/websocket-client/pom.xml | 3 +- yang/pom.xml | 90 +-- yang/yang-binding/pom.xml | 4 +- yang/yang-common/pom.xml | 3 +- yang/yang-data-api/pom.xml | 3 +- yang/yang-data-impl/pom.xml | 11 +- yang/yang-data-json/pom.xml | 3 +- yang/yang-data-operations/pom.xml | 3 +- yang/yang-data-util/pom.xml | 3 +- yang/yang-maven-plugin-it/pom.xml | 4 +- yang/yang-maven-plugin-spi/pom.xml | 3 +- yang/yang-maven-plugin/pom.xml | 4 +- yang/yang-model-api/pom.xml | 3 +- yang/yang-model-util/pom.xml | 3 +- yang/yang-parser-api/pom.xml | 3 +- yang/yang-parser-impl/pom.xml | 4 +- 64 files changed, 945 insertions(+), 1108 deletions(-) create mode 100644 common/parent/pom.xml diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index 6666e155a6..5b16fa7eec 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -44,6 +44,15 @@ maven-clean-plugin + diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index d5bc18d4d9..9f8ac51670 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -10,11 +10,10 @@ - binding-generator org.opendaylight.yangtools + binding-generator 0.6.2-SNAPSHOT - 4.0.0 maven-sal-api-gen-plugin diff --git a/code-generator/pom.xml b/code-generator/pom.xml index 74f1007f60..58846d1c45 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -11,10 +11,12 @@ org.opendaylight.yangtools - yangtools + yangtools-parent 0.6.2-SNAPSHOT + ../common/parent - + org.opendaylight.yangtools + 0.6.2-SNAPSHOT 4.0.0 binding-generator pom @@ -32,6 +34,7 @@ maven-sal-api-gen-plugin + @@ -181,4 +184,5 @@ + diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml index a42be7582e..e355f24a33 100644 --- a/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/code-generator/samples/maven-code-gen-sample/pom.xml @@ -11,9 +11,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - binding-generator org.opendaylight.yangtools - 0.6.0-SNAPSHOT + binding-generator + 0.6.2-SNAPSHOT maven-code-gen-sample @@ -49,7 +49,6 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.6.0-SNAPSHOT jar @@ -57,7 +56,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 generate-sources @@ -73,45 +71,7 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.yangtools - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - - - + org.opendaylight.yangtools diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml index b7f4ce3505..ab3bac3035 100644 --- a/code-generator/samples/modeling-sample/pom.xml +++ b/code-generator/samples/modeling-sample/pom.xml @@ -11,9 +11,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - binding-generator org.opendaylight.yangtools - 0.6.0-SNAPSHOT + binding-generator + 0.6.2-SNAPSHOT modeling-sample @@ -22,7 +22,6 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.8-SNAPSHOT @@ -49,7 +48,6 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.6.0-SNAPSHOT jar @@ -57,7 +55,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 generate-sources @@ -73,45 +70,7 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.yangtools - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - - - + org.opendaylight.yangtools diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index 8960ca9579..0a53537af2 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -9,11 +9,12 @@ --> 4.0.0 - - org.opendaylight.yangtools - common-parent - 0.6.2-SNAPSHOT - + + org.opendaylight.yangtools + yangtools-parent + 0.6.2-SNAPSHOT + /../../common/parent/pom.xml + checkstyle-logging @@ -32,4 +33,4 @@ test - \ No newline at end of file + diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index 657d8a1c6f..1c3e9d781b 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -11,11 +11,14 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml + bundle 4.0.0 + org.opendaylight.yangtools concepts ${project.artifactId} Common concepts diff --git a/common/feature/pom.xml b/common/feature/pom.xml index d1d84e1e90..84fb5559f6 100644 --- a/common/feature/pom.xml +++ b/common/feature/pom.xml @@ -4,8 +4,9 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml features-file diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 2e896de18b..c2e0d3e447 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -11,10 +11,12 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml + 4.0.0 mockito-configuration Default mockito configuration diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index beb2d035d2..1ef06e20b4 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -9,10 +9,12 @@ --> + org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml bundle 4.0.0 diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index 8a5b7c471a..0291ff9528 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -11,9 +11,11 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml + bundle 4.0.0 object-cache-guava diff --git a/common/object-cache-noop/pom.xml b/common/object-cache-noop/pom.xml index ca10b3cbb5..088243dc00 100644 --- a/common/object-cache-noop/pom.xml +++ b/common/object-cache-noop/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml bundle 4.0.0 diff --git a/common/parent/pom.xml b/common/parent/pom.xml new file mode 100644 index 0000000000..a931134473 --- /dev/null +++ b/common/parent/pom.xml @@ -0,0 +1,745 @@ + + + + + + + org.opendaylight.odlparent + odlparent + 1.4.2-SNAPSHOT + + + 4.0.0 + yangtools-parent + org.opendaylight.yangtools + 0.6.2-SNAPSHOT + pom + + 3.0.4 + + + + 4.10 + 3.0.0 + 2.1.6 + http://nexus.opendaylight.org/content + 0.2.0 + 2013.10.21.2-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2013.09.04.1-SNAPSHOT + 2.9.1 + + + + + + + junit + junit + 4.10 + test + + + org.apache.maven.shared + maven-verifier + 1.5 + test + + + org.ops4j.pax.exam + pax-exam-container-native + 3.0.0 + test + + + org.ops4j.pax.exam + pax-exam-junit4 + 3.0.0 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + 3.0.0 + test + + + equinoxSDK381 + org.eclipse.osgi + 3.8.1.v20120830-144521 + test + + + org.codehaus.groovy + groovy + 2.1.6 + test + + + org.codehaus.groovy + groovy-xml + 2.1.6 + test + + + xmlunit + xmlunit + 1.5 + test + + + ch.qos.logback + logback-classic + 1.0.9 + + + io.netty + netty-codec-http + 4.0.10.Final + + + org.opendaylight.yangtools + yang-data-util + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools.thirdparty + antlr4-runtime-osgi-nohead + 4.0 + test + + + org.opendaylight.yangtools.thirdparty + xtend-lib-osgi + 2.4.3 + test + + + org.opendaylight.yangtools + concepts + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + object-cache-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + object-cache-guava + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + object-cache-noop + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-model-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-generator-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-generator-spi + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-generator-util + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-generator-impl + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + binding-java-api-generator + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-common + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-data-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-data-impl + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-model-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-model-util + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-binding + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-parser-api + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-parser-impl + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-maven-plugin + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-maven-plugin-spi + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-inet-types + 2010.09.24.4-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-yang-types + 2010.09.24.4-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-restconf + 2013.09.04.1-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-ted + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology-isis + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology-l3-unicast-igp + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology-ospf + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology-l3-unicast + 2013.10.21.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-data-json + 0.6.2-SNAPSHOT + + + org.apache.maven + maven-core + 3.0.5 + + + org.apache.maven + maven-plugin-api + 3.0.5 + + + org.javassist + javassist + 3.17.1-GA + + + org.mockito + mockito-all + 1.9.5 + test + + + org.mockito + mockito-core + 1.9.5 + test + + + org.slf4j + slf4j-simple + 1.7.2 + test + + + org.slf4j + slf4j-api + 1.7.2 + + + org.slf4j + slf4j-log4j12 + 1.7.2 + + + org.slf4j + log4j-over-slf4j + 1.7.2 + + + xml-apis + xml-apis + 2.0.2 + + + ch.qos.logback + logback-core + 1.0.9 + + + com.google.guava + guava + 14.0.1 + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.4.3 + + + org.apache.commons + commons-lang3 + 3.1 + + + org.osgi + org.osgi.core + 5.0.0 + provided + + + commons-lang + commons-lang + 2.6 + + + commons-codec + commons-codec + 1.8 + + + com.google.code.findbugs + jsr305 + 2.0.3 + + + com.sun.jersey + jersey-client + 1.17 + + + javax.ws.rs + javax.ws.rs-api + 2.0 + + + javax.ws.rs + jsr311-api + 1.1.1 + + + + org.glassfish.jersey.ext + jersey-proxy-client + 2.0 + + + org.glassfish.jersey.core + jersey-client + 2.0 + + + + commons-io + commons-io + 2.4 + + + + org.opendaylight.yangtools + restconf-client-api + ${project.version} + + + org.opendaylight.yangtools + restconf-common + ${project.version} + + + org.opendaylight.yangtools + restconf-util + ${project.version} + + + org.opendaylight.yangtools + restconf-test-service + ${project.version} + + + org.opendaylight.yangtools + restconf-client-impl + ${project.version} + + + org.opendaylight.yangtools + restconf-jaxrs-api + ${project.version} + + + + org.opendaylight.yangtools + bug527-test-model + 0.6.2-SNAPSHOT + test + + + + org.opendaylight.yangtools + websocket-client + ${project.version} + + + + com.github.romix + java-concurrent-hash-trie-map + ${ctrie.version} + + + ${project.groupId} + object-cache-api + ${project.version} + + + ${project.groupId} + object-cache-guava + ${project.version} + + + ${project.groupId} + object-cache-noop + ${project.version} + + + ${project.groupId} + util + ${project.version} + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.version} + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + bundle-manifest + process-classes + + manifest + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.felix + maven-bundle-plugin + [1.0,) + + manifest + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + org.opendaylight.yangtools + yang-maven-plugin + 0.6.2-SNAPSHOT + + + + generate-sources + + + src/main/yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + target/generated-sources/sal + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/restconf + + + org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator + target/site/restconf + + + true + + + + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + 0.6.2-SNAPSHOT + jar + + + + + org.ops4j.pax.exam + maven-paxexam-plugin + 1.2.4 + + + generate-config + + generate-depends-file + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.version} + + stylesheet.css + + + + attach-javadocs + + jar + + + + + aggregate + + site + + + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + ${basedir}/src/main/xtend-gen + + + + + + maven-clean-plugin + 2.5 + + + + ${basedir}/src/main/xtend-gen + + ** + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.version} + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs.maven.plugin.version} + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + ${jdepend.maven.plugin.version} + + + + + + + opendaylight-mirror + opendaylight-mirror + http://nexus.opendaylight.org/content/groups/public/ + + false + + + true + never + + + + + + opendaylight-snapshot + opendaylight-snapshot + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + true + + + false + + + + diff --git a/common/pom.xml b/common/pom.xml index cfaf16e46c..32c77ea976 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -9,14 +9,11 @@ --> - - org.opendaylight.yangtools - yangtools - 0.6.2-SNAPSHOT - + org.opendaylight.yangtools + 0.6.2-SNAPSHOT 4.0.0 - common-parent + common-aggregator pom @@ -27,27 +24,7 @@ object-cache-api object-cache-guava object-cache-noop + parent util - - - - - ${project.groupId} - object-cache-api - ${project.version} - - - ${project.groupId} - object-cache-guava - ${project.version} - - - ${project.groupId} - object-cache-noop - ${project.version} - - - - diff --git a/common/util/pom.xml b/common/util/pom.xml index 146b009d43..081042a406 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - common-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml bundle 4.0.0 diff --git a/integration-test/bug527-test-model/pom.xml b/integration-test/bug527-test-model/pom.xml index aa64220cd9..4dfedba79c 100644 --- a/integration-test/bug527-test-model/pom.xml +++ b/integration-test/bug527-test-model/pom.xml @@ -1,17 +1,17 @@ - - org.opendaylight.yangtools.model - model-parent + org.opendaylight.yangtools + yangtools-parent 0.6.2-SNAPSHOT - ../../model/pom.xml + /../../common/parent/pom.xml 4.0.0 @@ -25,13 +25,17 @@ maven-jar-plugin + + org.opendaylight.yangtools + yang-maven-plugin + org.apache.felix maven-bundle-plugin true - ${project.groupId}.${project.artifactId} + org.opendaylight.yangtools.model.${project.artifactId} @@ -39,6 +43,16 @@ + + org.opendaylight.yangtools + yang-binding + 0.6.2-SNAPSHOT + + + org.opendaylight.yangtools + yang-common + 0.6.2-SNAPSHOT + org.opendaylight.yangtools.model yang-ext diff --git a/integration-test/bundle-test/pom.xml b/integration-test/bundle-test/pom.xml index 5ebad81abc..4ae787b3d3 100644 --- a/integration-test/bundle-test/pom.xml +++ b/integration-test/bundle-test/pom.xml @@ -8,60 +8,39 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + yangtools-parent org.opendaylight.yangtools - integration-tests 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 bundle-test - - 3.0.0 - - - - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ - - - junit junit - test org.ops4j.pax.exam pax-exam-container-native - ${exam.version} - test org.ops4j.pax.exam pax-exam-junit4 - ${exam.version} - test org.ops4j.pax.exam pax-exam-link-mvn - ${exam.version} - test equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 - test ch.qos.logback logback-classic - 1.0.9 org.sonatype.plexus @@ -75,25 +54,18 @@ org.opendaylight.yangtools yang-data-util - test org.opendaylight.yangtools maven-sal-api-gen-plugin - ${project.parent.version} - test org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead - 4.0 - test org.opendaylight.yangtools.thirdparty xtend-lib-osgi - 2.4.3 - test @@ -102,49 +74,7 @@ org.ops4j.pax.exam maven-paxexam-plugin - 1.2.4 - - - generate-config - - generate-depends-file - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.ops4j.pax.exam - - maven-paxexam-plugin - - [1.2.4,) - - generate-depends-file - - - - - - - - - - - - - diff --git a/integration-test/pom.xml b/integration-test/pom.xml index f609ce8611..2b9a20c908 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -7,14 +7,10 @@ - - org.opendaylight.yangtools - yangtools - 0.6.2-SNAPSHOT - - + org.opendaylight.yangtools + 0.6.2-SNAPSHOT 4.0.0 - integration-tests + integration-tests-aggregator pom @@ -25,75 +21,4 @@ yang-runtime-tests - - - - org.opendaylight.yangtools - yang-common - ${project.version} - - - org.opendaylight.yangtools - yang-data-api - ${project.version} - - - org.opendaylight.yangtools - yang-data-util - ${project.version} - - - org.opendaylight.yangtools - yang-model-api - ${project.version} - - - org.opendaylight.yangtools - yang-model-util - ${project.version} - - - org.opendaylight.yangtools - yang-binding - ${project.version} - - - org.opendaylight.yangtools - yang-parser-api - ${project.version} - - - org.opendaylight.yangtools - yang-parser-impl - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin-spi - ${project.version} - - - - - org.apache.maven - maven-core - 3.0.5 - - - org.apache.maven - maven-plugin-api - 3.0.5 - - - org.opendaylight.yangtools - binding-generator-impl - ${project.version} - - - diff --git a/integration-test/regression-test-model/pom.xml b/integration-test/regression-test-model/pom.xml index 9cd8a97a72..7f0b373d9a 100644 --- a/integration-test/regression-test-model/pom.xml +++ b/integration-test/regression-test-model/pom.xml @@ -7,11 +7,12 @@ + - org.opendaylight.yangtools.model - model-parent + org.opendaylight.yangtools 0.6.2-SNAPSHOT - ../../model/pom.xml + yangtools-parent + /../../common/parent/pom.xml 4.0.0 @@ -31,10 +32,14 @@ true - ${project.groupId}.${project.artifactId} + org.opendaylight.yangtools.model.${project.artifactId} + + org.opendaylight.yangtools + yang-maven-plugin + diff --git a/integration-test/test-models/pom.xml b/integration-test/test-models/pom.xml index 1330810048..d3dd239e4c 100644 --- a/integration-test/test-models/pom.xml +++ b/integration-test/test-models/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - integration-tests + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/integration-test/yang-runtime-tests/pom.xml b/integration-test/yang-runtime-tests/pom.xml index 033c4944ea..beb78c9193 100644 --- a/integration-test/yang-runtime-tests/pom.xml +++ b/integration-test/yang-runtime-tests/pom.xml @@ -1,17 +1,20 @@ - 4.0.0 + org.opendaylight.yangtools - integration-tests + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml + yang-runtime-tests bundle @@ -31,7 +34,6 @@ org.opendaylight.yangtools.model ietf-topology - 2013.10.21.2-SNAPSHOT junit diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index ab12e14c2e..34b54a6a73 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -13,6 +13,7 @@ model-iana org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index 9e20bee8c9..dbb472788a 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -13,6 +13,7 @@ model-iana org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 7bc1abe2e0..9ad48a2a83 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -13,6 +13,7 @@ model-parent org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index 0186ca2498..18ceb60480 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -21,6 +21,8 @@ ${project.artifactId} ${project.artifactId} + + @@ -36,6 +38,7 @@ + diff --git a/model/ietf/ietf-netconf/pom.xml b/model/ietf/ietf-netconf/pom.xml index 299cfddbf1..2316600520 100644 --- a/model/ietf/ietf-netconf/pom.xml +++ b/model/ietf/ietf-netconf/pom.xml @@ -13,7 +13,7 @@ model-ietf org.opendaylight.yangtools.model - 0.6.0-SNAPSHOT + 0.6.2-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml index 9e8aff00ca..8b62c3e1c7 100644 --- a/model/ietf/ietf-restconf/pom.xml +++ b/model/ietf/ietf-restconf/pom.xml @@ -16,6 +16,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-restconf 2013.10.19.1-SNAPSHOT diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index 5fdaa6aa80..8265a7c135 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-ted 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 8995299e67..b5048c9cc0 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-isis 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index bbc643ab0b..2db65be1cd 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -9,12 +9,14 @@ --> + model-ietf org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-l3-unicast-igp 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index 331b610c47..04d847ef7c 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-ospf 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 4b72df53a2..86b8141554 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -14,7 +14,6 @@ org.opendaylight.yangtools.model 0.6.2-SNAPSHOT - 4.0.0 ietf-topology 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 1cd98f48a3..50229c823f 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -23,7 +23,11 @@ 2013.10.21.2-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2013.09.04.1-SNAPSHOT + ietf-inet-types ietf-yang-types @@ -42,17 +46,17 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.4-SNAPSHOT + ${ietf.inet.types.version} org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.4-SNAPSHOT + ${ietf.yang.types.version} org.opendaylight.yangtools.model ietf-restconf - 2013.09.04.1-SNAPSHOT + ${ietf.restconf.version} ${project.groupId} @@ -81,4 +85,4 @@ - + diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index 99fc9dec41..bbea425cd1 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 opendaylight-l2-types 2013.08.27.4-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 3dc26a7439..f0b7c6549d 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -11,21 +11,18 @@ org.opendaylight.yangtools - yangtools + yangtools-parent 0.6.2-SNAPSHOT + ../common/parent - - 4.0.0 org.opendaylight.yangtools.model + + 4.0.0 model-parent pom ${project.artifactId} ${project.artifactId} - - UTF-8 - - yang-ext iana @@ -96,64 +93,16 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [0.5,) - - - generate-sources - - - - - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - - - - org.opendaylight.yangtools yang-binding - 0.6.2-SNAPSHOT org.opendaylight.yangtools yang-common - 0.6.2-SNAPSHOT - diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml index 6fc7a801ca..6a1d7d84e5 100644 --- a/model/yang-ext/pom.xml +++ b/model/yang-ext/pom.xml @@ -10,11 +10,12 @@ - org.opendaylight.yangtools.model model-parent + org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + 4.0.0 yang-ext 2013.09.07.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index de8b4e1722..cf6dcbf84b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,41 +11,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - yangtools + yangtools-aggregator org.opendaylight.yangtools 0.6.2-SNAPSHOT pom - - 3.0.4 - - - - UTF-8 - http://nexus.opendaylight.org/content - - - 1.7 - 1.7 - - - 2.4.0 - 2.3.2 - 2.9.1 - 2.4.2 - 2.2.1 - 2.16 - - - 3.1 - 4.10 - 1.7.2 - 14.0.1 - 2.4.3 - 2.1.6 - 1.9.5 - 3.17.1-GA - 0.2.0 - scm:git:ssh://git.opendaylight.org:29418/yangtools.git @@ -65,367 +34,4 @@ - - - - opendaylight-mirror - opendaylight-mirror - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - true - - - false - - - - - - - - opendaylight-mirror - opendaylight-mirror - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - true - - - false - - - - - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - com.google.guava - guava - ${guava.version} - - - org.eclipse.xtend - org.eclipse.xtend.lib - ${xtend.version} - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - com.google.code.findbugs - jsr305 - 2.0.3 - - - com.github.romix - java-concurrent-hash-trie-map - ${ctrie.version} - - - - - org.sonatype.plexus - plexus-build-api - 0.0.7 - - - org.codehaus.plexus - plexus-slf4j-logging - 1.1 - - - commons-io - commons-io - 2.4 - - - - - - ${project.groupId} - concepts - ${project.version} - - - ${project.groupId} - object-cache-api - ${project.version} - - - ${project.groupId} - object-cache-guava - ${project.version} - - - ${project.groupId} - object-cache-noop - ${project.version} - - - ${project.groupId} - util - ${project.version} - - - - - - - org.slf4j - slf4j-simple - - - - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - ${project.artifactId}-site - ./ - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - bundle-manifest - process-classes - - manifest - - - - - - ${project.groupId}.${project.artifactId} - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - - - ${basedir}/src/main/xtend-gen - - - - - - maven-clean-plugin - 2.5 - - - - ${basedir}/src/main/xtend-gen - - ** - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.version} - - stylesheet.css - - - - attach-javadocs - - jar - - - - - aggregate - - site - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.version} - - - - clean install - clean install - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.version} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - diff --git a/restconf/pom.xml b/restconf/pom.xml index 18392f22f3..193d56c5fd 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -11,14 +11,11 @@ org.opendaylight.yangtools - yangtools + yangtools-parent 0.6.2-SNAPSHOT + ../common/parent - - - ${project.version} - - + org.opendaylight.yangtools 4.0.0 restconf-parent pom @@ -32,114 +29,6 @@ restconf-client-impl - - - - org.opendaylight.yangtools - websocket-client - ${project.version} - - - org.opendaylight.yangtools - restconf-client-api - ${project.version} - - - org.opendaylight.yangtools - restconf-common - ${project.version} - - - org.opendaylight.yangtools - restconf-util - ${project.version} - - - org.opendaylight.yangtools - restconf-test-service - ${project.version} - - - org.opendaylight.yangtools - restconf-client-impl - ${project.version} - - - org.opendaylight.yangtools - restconf-jaxrs-api - ${project.version} - - - org.opendaylight.yangtools - yang-common - ${project.version} - - - org.opendaylight.yangtools - yang-data-api - ${project.version} - - - org.opendaylight.yangtools - yang-data-util - ${project.version} - - - org.opendaylight.yangtools - yang-data-impl - ${project.version} - - - org.opendaylight.yangtools - yang-model-api - ${project.version} - - - org.opendaylight.yangtools - yang-binding - ${project.version} - - - org.opendaylight.yangtools - concepts - ${project.version} - - - - javax.ws.rs - javax.ws.rs-api - 2.0 - - - javax.ws.rs - jsr311-api - 1.1.1 - - - - org.glassfish.jersey.ext - jersey-proxy-client - 2.0 - - - org.glassfish.jersey.core - jersey-client - 2.0 - - - - org.opendaylight.yangtools - yang-model-util - ${project.version} - - - org.opendaylight.yangtools - binding-generator-impl - ${project.version} - - - - @@ -162,40 +51,5 @@ - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - - - - - diff --git a/restconf/restconf-client-api/pom.xml b/restconf/restconf-client-api/pom.xml index 91e08bd124..195ed6524a 100644 --- a/restconf/restconf-client-api/pom.xml +++ b/restconf/restconf-client-api/pom.xml @@ -12,7 +12,7 @@ restconf-client-api bundle - + org.opendaylight.yangtools restconf-parent 0.6.2-SNAPSHOT diff --git a/restconf/restconf-client-impl/pom.xml b/restconf/restconf-client-impl/pom.xml index 75eefd3780..6431684f3d 100644 --- a/restconf/restconf-client-impl/pom.xml +++ b/restconf/restconf-client-impl/pom.xml @@ -10,12 +10,12 @@ 4.0.0 - - org.opendaylight.yangtools - restconf-parent - 0.6.2-SNAPSHOT - + + org.opendaylight.yangtools + restconf-parent + 0.6.2-SNAPSHOT + restconf-client-impl bundle diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml index 934fe1686b..102ddf760b 100644 --- a/restconf/restconf-common/pom.xml +++ b/restconf/restconf-common/pom.xml @@ -10,6 +10,7 @@ 4.0.0 + org.opendaylight.yangtools restconf-parent diff --git a/restconf/restconf-jaxrs-api/pom.xml b/restconf/restconf-jaxrs-api/pom.xml index f62df8a9ba..292b7d0f5b 100644 --- a/restconf/restconf-jaxrs-api/pom.xml +++ b/restconf/restconf-jaxrs-api/pom.xml @@ -15,7 +15,6 @@ restconf-parent 0.6.2-SNAPSHOT - restconf-jaxrs-api restconf-jaxrs-api diff --git a/restconf/restconf-test-service/pom.xml b/restconf/restconf-test-service/pom.xml index d20270a339..e5e2a1b980 100644 --- a/restconf/restconf-test-service/pom.xml +++ b/restconf/restconf-test-service/pom.xml @@ -10,14 +10,14 @@ 4.0.0 - - org.opendaylight.yangtools - restconf-parent - 0.6.2-SNAPSHOT - + + org.opendaylight.yangtools + restconf-parent + 0.6.2-SNAPSHOT + - restconf-test-service + restconf-test-service org.opendaylight.yangtools @@ -36,7 +36,7 @@ maven-bundle-plugin true - + diff --git a/restconf/restconf-util/pom.xml b/restconf/restconf-util/pom.xml index 06c4863a07..99c08eb515 100644 --- a/restconf/restconf-util/pom.xml +++ b/restconf/restconf-util/pom.xml @@ -7,6 +7,7 @@ 4.0.0 + org.opendaylight.yangtools restconf-parent diff --git a/third-party/antlr4-runtime-osgi/pom.xml b/third-party/antlr4-runtime-osgi/pom.xml index 2232c13157..061363e288 100644 --- a/third-party/antlr4-runtime-osgi/pom.xml +++ b/third-party/antlr4-runtime-osgi/pom.xml @@ -10,11 +10,14 @@ 4.0.0 + - org.opendaylight.yangtools.thirdparty + org.opendaylight.yangtools third-party-parent - 0.1.2 + 0.6.2-SNAPSHOT + ../pom.xml + antlr4-runtime-osgi-nohead 4.0 bundle diff --git a/third-party/pom.xml b/third-party/pom.xml index 43224c28ab..ba1b0fe6ce 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -10,73 +10,24 @@ 4.0.0 + + + org.opendaylight.yangtools + yangtools-parent + 0.6.2-SNAPSHOT + ../parent/pom.xml + + - 0.1.2 org.opendaylight.yangtools.thirdparty third-party-parent pom - - http://nexus.opendaylight.org/content - - - - scm:git:ssh://git.opendaylight.org:29418/yangtools.git - scm:git:ssh://git.opendaylight.org:29418/yangtools.git - https://wiki.opendaylight.org/view/YANG_Tools:Third-Party - - xtend-lib-osgi antlr4-runtime-osgi - - - - opendaylight-mirror - opendaylight-mirror - ${nexusproxy}/groups/public/ - - false - - - true - never - - - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - true - - - false - - - - - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - ${project.artifactId}-site - ./ - - - @@ -92,4 +43,5 @@ + diff --git a/third-party/xtend-lib-osgi/pom.xml b/third-party/xtend-lib-osgi/pom.xml index 16edbf6536..2a4017530c 100644 --- a/third-party/xtend-lib-osgi/pom.xml +++ b/third-party/xtend-lib-osgi/pom.xml @@ -11,10 +11,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.yangtools.thirdparty + org.opendaylight.yangtools third-party-parent - 0.1.2 + 0.6.2-SNAPSHOT + ../pom.xml + xtend-lib-osgi 2.4.3 bundle diff --git a/websocket/pom.xml b/websocket/pom.xml index d3c9ccf95f..578384aa5a 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -11,26 +11,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.opendaylight.yangtools - yangtools - 0.6.2-SNAPSHOT - - - websocket-parent + org.opendaylight.yangtools + 0.6.2-SNAPSHOT + websocket-aggregator pom websocket-client - - - - io.netty - netty-codec-http - 4.0.10.Final - - - diff --git a/websocket/websocket-client/pom.xml b/websocket/websocket-client/pom.xml index 9a1c8df5ae..5276049630 100644 --- a/websocket/websocket-client/pom.xml +++ b/websocket/websocket-client/pom.xml @@ -13,8 +13,9 @@ org.opendaylight.yangtools - websocket-parent + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml websocket-client diff --git a/yang/pom.xml b/yang/pom.xml index 5cbc84271d..5ed681efab 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -9,14 +9,10 @@ --> - - org.opendaylight.yangtools - yangtools - 0.6.2-SNAPSHOT - - + org.opendaylight.yangtools + 0.6.2-SNAPSHOT 4.0.0 - yang + yang-aggregator pom @@ -35,84 +31,4 @@ yang-parser-impl yang-data-json - - - 2.3.7 - - - - - org.opendaylight.yangtools - yang-common - ${project.version} - - - org.opendaylight.yangtools - yang-data-api - ${project.version} - - - org.opendaylight.yangtools - yang-data-impl - ${project.version} - - - org.opendaylight.yangtools - yang-data-json - ${project.version} - - - org.opendaylight.yangtools - yang-data-util - ${project.version} - - - org.opendaylight.yangtools - yang-model-api - ${project.version} - - - org.opendaylight.yangtools - yang-model-util - ${project.version} - - - org.opendaylight.yangtools - yang-binding - ${project.version} - - - org.opendaylight.yangtools - yang-parser-api - ${project.version} - - - org.opendaylight.yangtools - yang-parser-impl - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin-spi - ${project.version} - - - - - org.apache.maven - maven-core - 3.0.5 - - - org.apache.maven - maven-plugin-api - 3.0.5 - - - diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index 679ba67a45..30c62fb271 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -11,11 +11,13 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 + org.opendaylight.yangtools yang-binding ${project.artifactId} Java binding for YANG diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index c2fea0c66c..32038f430e 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index dd492c6b96..df63489646 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 538195109b..8543c2be35 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 @@ -20,9 +21,6 @@ ${project.artifactId} ${project.artifactId} - - 2.1.6 - @@ -88,25 +86,21 @@ org.slf4j slf4j-log4j12 - ${slf4j.version} test org.codehaus.groovy groovy - ${groovy.version} test org.codehaus.groovy groovy-xml - ${groovy.version} test xmlunit xmlunit - 1.5 test @@ -117,7 +111,6 @@ commons-lang commons-lang - 2.6 diff --git a/yang/yang-data-json/pom.xml b/yang/yang-data-json/pom.xml index 9327cf847d..228b9d82d2 100644 --- a/yang/yang-data-json/pom.xml +++ b/yang/yang-data-json/pom.xml @@ -9,8 +9,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-data-operations/pom.xml b/yang/yang-data-operations/pom.xml index dee77da4a0..8d5397bb06 100644 --- a/yang/yang-data-operations/pom.xml +++ b/yang/yang-data-operations/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index 8fef0865e4..d6615f7afb 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index bc4ade4bce..866b156f4e 100644 --- a/yang/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 @@ -22,7 +23,6 @@ org.apache.maven.shared maven-verifier - 1.5 test diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index ade092188d..2cdd00bc40 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 8ffa8204c2..90beda09f1 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -11,11 +11,13 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 + org.opendaylight.yangtools yang-maven-plugin maven-plugin diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 8f16814a37..10d7a13fda 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 5cf126d0a2..c4c5a8720f 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index a7e145ba2e..5188319263 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 7e436362f4..8d1c6d9ad6 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -11,8 +11,9 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 @@ -89,7 +90,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 generate-sources -- 2.36.6