From f84d7f0840639ade4824c7be0aef01b390ec7d9b Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 14 Jun 2016 16:12:12 +0200 Subject: [PATCH] Drop yangtools-parent This emerged from trying to use odlparent's bundle-parent for bundles, and thus be able to remove the yangtools overrides for maven-jar-plugin and maven-javadoc-plugin in particular. This probably removes features from yangtools-parent which should be replicated elsewhere; in particular, the Sonar/JaCoCo integration should be available for everyone. Change-Id: Id41e61eb3da2f30be29981a11387bde467acae3d Signed-off-by: Stephen Kitt --- common/checkstyle-logging/pom.xml | 11 +- common/concepts/pom.xml | 19 +- common/mockito-configuration/pom.xml | 10 +- common/object-cache-api/pom.xml | 22 +- common/object-cache-guava/pom.xml | 22 +- common/object-cache-noop/pom.xml | 22 +- common/parent/pom.xml | 492 ------------------ common/pom.xml | 11 +- common/util/pom.xml | 31 +- third-party/xsd-regex/pom.xml | 39 +- websocket/pom.xml | 19 +- websocket/websocket-client/pom.xml | 10 +- yang-validation-tool/pom.xml | 22 +- yang/pom.xml | 10 +- yang/yang-common/pom.xml | 23 +- yang/yang-data-api/pom.xml | 23 +- yang/yang-data-codec-gson/pom.xml | 23 +- yang/yang-data-codec-xml/pom.xml | 23 +- yang/yang-data-impl/pom.xml | 63 ++- yang/yang-data-jaxen/pom.xml | 22 +- yang/yang-data-transform/pom.xml | 22 +- yang/yang-data-util/pom.xml | 23 +- yang/yang-maven-plugin-it/pom.xml | 11 +- .../test-parent/AdditionalConfig/pom.xml | 2 +- .../resources/test-parent/Correct/pom.xml | 2 +- .../test-parent/GenerateTest1/pom.xml | 2 +- .../test-parent/GenerateTest2/pom.xml | 2 +- .../resources/test-parent/Generator/pom.xml | 2 +- .../test-parent/InvalidVersion/pom.xml | 2 +- .../test-parent/MissingYangInDep/pom.xml | 2 +- .../test-parent/NoGenerators/pom.xml | 2 +- .../resources/test-parent/NoOutputDir/pom.xml | 2 +- .../resources/test-parent/NoYangFiles/pom.xml | 2 +- .../test-parent/UnknownGenerator/pom.xml | 2 +- .../test-parent/YangRootNotExist/pom.xml | 2 +- .../src/test/resources/test-parent/pom.xml | 10 +- yang/yang-maven-plugin-spi/pom.xml | 24 +- yang/yang-maven-plugin/pom.xml | 24 +- yang/yang-model-api/pom.xml | 23 +- yang/yang-model-export/pom.xml | 37 +- yang/yang-model-util/pom.xml | 37 +- yang/yang-parser-api/pom.xml | 23 +- yang/yang-parser-impl/pom.xml | 25 +- 43 files changed, 512 insertions(+), 688 deletions(-) delete mode 100644 common/parent/pom.xml diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index 2916770251..4628cf1216 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -10,12 +10,15 @@ 4.0.0 - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + org.opendaylight.yangtools checkstyle-logging + 1.0.0-SNAPSHOT + bundle diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index 48ab81ae45..328d392105 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -10,15 +10,17 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + bundle 4.0.0 + org.opendaylight.yangtools concepts + 1.0.0-SNAPSHOT ${project.artifactId} Common concepts @@ -38,15 +40,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - - ${project.artifactId} diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index 4404ccdf00..b81116b6d0 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -11,14 +11,28 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + bundle 4.0.0 + org.opendaylight.yangtools object-cache-api + 1.0.0-SNAPSHOT + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index daff25ed41..d5b95a9d03 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -10,15 +10,29 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + bundle 4.0.0 + org.opendaylight.yangtools object-cache-guava + 1.0.0-SNAPSHOT + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + diff --git a/common/object-cache-noop/pom.xml b/common/object-cache-noop/pom.xml index f60d76ca6e..3df00e30ef 100644 --- a/common/object-cache-noop/pom.xml +++ b/common/object-cache-noop/pom.xml @@ -10,14 +10,28 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + bundle 4.0.0 + org.opendaylight.yangtools object-cache-noop + 1.0.0-SNAPSHOT + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + diff --git a/common/parent/pom.xml b/common/parent/pom.xml deleted file mode 100644 index cb7efdc2c4..0000000000 --- a/common/parent/pom.xml +++ /dev/null @@ -1,492 +0,0 @@ - - - - - - - org.opendaylight.odlparent - odlparent - 1.7.0-SNAPSHOT - - - - 4.0.0 - yangtools-parent - org.opendaylight.yangtools - 1.0.0-SNAPSHOT - pom - - - 1.0.0-SNAPSHOT - - - - - - - org.apache.maven.shared - maven-verifier - 1.6 - test - - - org.codehaus.groovy - groovy - 2.4.5 - test - - - org.codehaus.groovy - groovy-xml - 2.4.5 - test - - - org.apache.maven - maven-core - 3.3.9 - - - org.apache.maven - maven-plugin-api - 3.3.9 - - - org.eclipse.xtend - org.eclipse.xtend.lib - 2.8.4 - - - - org.glassfish.jersey.ext - jersey-proxy-client - 2.22 - - - org.glassfish.jersey.core - jersey-client - 2.22 - - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom - - - - org.antlr - antlr4-runtime - 4.5.1 - - - - - - - - org.codehaus.sonar-plugins.java - sonar-jacoco-listeners - ${sonar-jacoco-listeners.version} - test - - - org.slf4j - slf4j-simple - test - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - ${jacoco.agent.it.arg} - - - listener - org.sonar.java.jacoco.JUnitListener - - - - ${project.build.directory}/surefire-reports - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - ${jacoco.agent.ut.arg} - - - listener - org.sonar.java.jacoco.JUnitListener - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.0,) - - run - - - - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [0.5,) - - generate-sources - - - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - write-project-properties - - - - - - - - - org.ops4j.pax.exam - maven-paxexam-plugin - 1.2.4 - - generate-depends-file - - - - - - - - - org.jacoco - jacoco-maven-plugin - [0.6,) - - prepare-agent - - - - - - - - - org.antlr - antlr4-maven-plugin - [4.0,) - - antlr4 - - - - - - - - - - - - org.opendaylight.yangtools - yang-maven-plugin - 1.0.0-SNAPSHOT - - - - generate-sources - - - src/main/yang - true - - - - - - 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.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - - add-source - - - - target/generated-sources/parser - target/generated-sources/sal - ${basedir}/src/main/xtend-gen - - - - - - - org.eclipse.xtend - xtend-maven-plugin - 2.8.4 - - - - compile - - - ${basedir}/src/main/xtend-gen - - - - - - org.apache.servicemix.tooling - depends-maven-plugin - - - generate-depends-file - - generate-depends-file - - - - - - - org.antlr - antlr4-maven-plugin - 4.5.1 - - - - antlr4 - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - - - maven-clean-plugin - - - - ${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 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.jacoco - jacoco-maven-plugin - - - prepare-ut-agent - process-test-classes - - prepare-agent - - - ${sonar.jacoco.reportPath} - jacoco.agent.ut.arg - - - - prepare-it-agent - pre-integration-test - - prepare-agent - - - ${sonar.jacoco.itReportPath} - jacoco.agent.it.arg - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - - diff --git a/common/pom.xml b/common/pom.xml index d6230521f6..796ddce6f2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,14 +10,16 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - parent + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools common-aggregator + 1.0.0-SNAPSHOT pom @@ -29,7 +31,6 @@ object-cache-api object-cache-guava object-cache-noop - parent util diff --git a/common/util/pom.xml b/common/util/pom.xml index 967f61baa6..9d3885d7e1 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -10,14 +10,28 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + bundle 4.0.0 + org.opendaylight.yangtools util + 1.0.0-SNAPSHOT + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + @@ -52,15 +66,6 @@ test - - - - org.apache.felix - maven-bundle-plugin - true - - - - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-codec-gson + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + org.opendaylight.yangtools diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index 55a393099b..36fef59909 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -9,17 +9,32 @@ --> - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-codec-xml + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + org.opendaylight.yangtools diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index a76d8fe664..bc5daf0c03 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -8,23 +8,45 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-impl + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + org.antlr antlr4-maven-plugin + 4.5.1 + + + + antlr4 + + + src/main/antlr target/generated-sources/parser/org/opendaylight/yangtools/yang/data/impl/leafref @@ -32,10 +54,6 @@ true - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.maven.plugins maven-surefire-plugin @@ -57,6 +75,34 @@ + + org.jacoco + jacoco-maven-plugin + + + prepare-ut-agent + process-test-classes + + prepare-agent + + + ${sonar.jacoco.reportPath} + jacoco.agent.ut.arg + + + + prepare-it-agent + pre-integration-test + + prepare-agent + + + ${sonar.jacoco.itReportPath} + jacoco.agent.it.arg + + + + @@ -125,6 +171,7 @@ org.antlr antlr4-runtime + 4.5.1 diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml index a3b384c9fa..4ee4dfcfda 100644 --- a/yang/yang-data-jaxen/pom.xml +++ b/yang/yang-data-jaxen/pom.xml @@ -11,18 +11,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-jaxen + 1.0.0-SNAPSHOT ${project.artifactId} ${project.artifactId} bundle + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + ${project.groupId} diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml index e5ca6f77e5..435dd06677 100644 --- a/yang/yang-data-transform/pom.xml +++ b/yang/yang-data-transform/pom.xml @@ -10,17 +10,31 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-transform + 1.0.0-SNAPSHOT ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + ${project.groupId} diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index 9857815097..968ac43e5e 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -10,17 +10,32 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-data-util + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + ${project.groupId} diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index 53b6e5afb6..ec49020712 100644 --- a/yang/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -10,19 +10,22 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-maven-plugin-it + 1.0.0-SNAPSHOT org.apache.maven.shared maven-verifier + 1.6 test diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml index 0caf0d03b1..dcff162749 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ additional-config diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml index 38603e8078..f00ab1370e 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ correct diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml index 8475ab3e1f..3dab19558d 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ generator-test1 diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml index 1ec0e179bf..60becc2fc4 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ generator-test2 diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml index 7b2448648e..840e6bf699 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ generator diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml index 89375edf4d..715d445c7b 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ invalid-version diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml index 51b0ac247c..b51cde0aed 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ missing-yang-in-dep diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml index f9bccea085..597917956b 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ no-generators diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml index 8b8436f371..345995faed 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ no-output-dir diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml index 07c8d8e8b5..f02e13b1bf 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ no-yang-files diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml index 039ff88658..feb3b62d07 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ unknown-generator diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml index d679b50104..1d0985a154 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.yangtools test-parent - @project.parent.version@ + @project.version@ yang-root-not-exist diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml index 95106a2708..05609eb15d 100644 --- a/yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml @@ -8,15 +8,9 @@ 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-parent - @project.parent.version@ - /../../common/parent/pom.xml - - org.opendaylight.yangtools test-parent + @project.version@ pom @@ -41,7 +35,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0-alpha-2 + 1.0.0 generate-resources diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index b877eeb223..c17eb4c519 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -10,17 +10,31 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-maven-plugin-spi + 1.0.0-SNAPSHOT ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + org.opendaylight.yangtools @@ -30,11 +44,13 @@ org.apache.maven maven-plugin-api + 3.3.9 provided org.apache.maven maven-core + 3.3.9 provided diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 65791d5a63..020c9d3fba 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -10,14 +10,16 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-maven-plugin + 1.0.0-SNAPSHOT maven-plugin This plugin is a wrapper for "yang to source code" generation. @@ -28,14 +30,28 @@ TODO: add sample usage when finished + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + org.apache.maven maven-core + 3.3.9 org.apache.maven maven-plugin-api + 3.3.9 org.apache.maven.plugin-tools diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 96097976a0..4664a0804c 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -10,17 +10,32 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-model-api + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + ${project.groupId} diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index 1433c148c7..80e1cbe33e 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -10,17 +10,32 @@ - org.opendaylight.yangtools - yangtools-parent - 1.0.0-SNAPSHOT - /../../common/parent/pom.xml + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + 4.0.0 + org.opendaylight.yangtools yang-model-export + 1.0.0-SNAPSHOT + bundle ${project.artifactId} ${project.artifactId} + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.0.0-SNAPSHOT + import + pom + + + + ${project.groupId} @@ -56,20 +71,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - ${project.groupId}.${project.artifactId} - - - - - -