From e79d0987102ab3687db14faab97b81649e35fd89 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 27 Sep 2013 13:38:22 +0200 Subject: [PATCH] Updated pom files, added concepts component Change-Id: Id7e0b320b8edbe89c52220c13b1b0d70bf7d1e30 Signed-off-by: Tony Tkacik --- code-generator/binding-generator-util/pom.xml | 6 - code-generator/pom.xml | 27 +-- concepts/pom.xml | 23 +++ .../yangtools/concepts/Builder.java | 19 ++ .../yangtools/concepts/Identifiable.java | 12 ++ .../yangtools/concepts/Immutable.java | 24 +++ .../yangtools/concepts/Mutable.java | 21 +++ .../yangtools/concepts/MutationBehaviour.java | 22 +++ .../yangtools/concepts/Namespace.java | 12 ++ .../yangtools/concepts/OrderedSet.java | 9 + model/iana/iana-afn-safi/pom.xml | 2 +- model/iana/iana-if-type/pom.xml | 2 +- model/ietf/ietf-inet-types/pom.xml | 2 +- model/ietf/ietf-netconf/pom.xml | 30 +++ model/ietf/ietf-ted/pom.xml | 2 +- model/ietf/ietf-topology-isis/pom.xml | 2 +- .../ietf/ietf-topology-l3-unicast-igp/pom.xml | 2 +- model/ietf/ietf-topology-ospf/pom.xml | 2 +- model/ietf/ietf-topology/pom.xml | 6 +- model/ietf/ietf-yang-types/pom.xml | 2 +- model/ietf/pom.xml | 1 + model/l2-types/pom.xml | 2 +- model/pom.xml | 26 +-- {yang => model}/yang-ext/pom.xml | 6 +- .../yang-ext/src/main/yang/yang-ext.yang | 0 pom.xml | 172 +++++++++++++----- third-party/pom.xml | 31 ++++ third-party/xtend-lib-osgi/pom.xml | 75 ++++++++ yang/pom.xml | 97 ---------- yang/yang-binding/pom.xml | 26 --- yang/yang-common/pom.xml | 26 --- yang/yang-data-api/pom.xml | 26 --- yang/yang-data-impl/pom.xml | 21 --- yang/yang-data-util/pom.xml | 26 --- yang/yang-maven-plugin-spi/pom.xml | 17 -- yang/yang-maven-plugin/pom.xml | 9 + yang/yang-model-api/pom.xml | 26 --- yang/yang-model-util/pom.xml | 47 ----- yang/yang-parser-api/pom.xml | 26 --- yang/yang-parser-impl/pom.xml | 48 ----- 40 files changed, 431 insertions(+), 504 deletions(-) create mode 100644 concepts/pom.xml create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java create mode 100644 concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java create mode 100644 model/ietf/ietf-netconf/pom.xml rename {yang => model}/yang-ext/pom.xml (95%) rename {yang => model}/yang-ext/src/main/yang/yang-ext.yang (100%) create mode 100644 third-party/pom.xml create mode 100644 third-party/xtend-lib-osgi/pom.xml diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index 33be499ffc..9d82149800 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -42,12 +42,6 @@ org.apache.felix maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - diff --git a/code-generator/pom.xml b/code-generator/pom.xml index 834a326949..0e18ee615e 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -30,6 +30,7 @@ + org.opendaylight.yangtools binding-model-api @@ -65,6 +66,7 @@ maven-sal-api-gen-plugin ${project.version} + org.opendaylight.yangtools yang-common @@ -120,30 +122,8 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - + org.apache.felix maven-bundle-plugin @@ -186,5 +166,4 @@ - diff --git a/concepts/pom.xml b/concepts/pom.xml new file mode 100644 index 0000000000..180d01d702 --- /dev/null +++ b/concepts/pom.xml @@ -0,0 +1,23 @@ + + + + org.opendaylight.yangtools + yangtools + 0.5-SNAPSHOT + + bundle + 4.0.0 + concepts + Concepts + Java binding for YANG + + + + + org.apache.felix + maven-bundle-plugin + + + + diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java new file mode 100644 index 0000000000..7cf29157a3 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.concepts; + +/** + * Builder of product. + * + * @author ttkacik + * + * @param

Product of Build process + */ +public interface Builder

{ + P toInstance(); +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java new file mode 100644 index 0000000000..aea084c538 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.concepts; + +public interface Identifiable { + T getIdentifier(); +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java new file mode 100644 index 0000000000..c2630317c4 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.concepts; + +/** + * Immutable Object - object does not change its state during lifecycle. + * + * Implementations of this interface must not change any public state during + * their whole lifecycle. + * + * This interface is mutually exclusive with {@link Mutable} and other + * {@link MutationBehaviour}s. + * + * @author Tony Tkacik + * + */ +public interface Immutable extends MutationBehaviour { + +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java new file mode 100644 index 0000000000..60c10352df --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.concepts; + +/** + * Mutable object - object may change it's state during lifecycle. + * + * This interface is mutually exclusive with {@link Immutable} and other + * {@link MutationBehaviour}s. + * + * @author Tony Tkacik + * + */ +public interface Mutable extends MutationBehaviour{ + +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java new file mode 100644 index 0000000000..95d844d506 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.concepts; + +/** + * Mutation behavior + * + * This interface is used to prevent same class extends multiple types of MutationBehaviour + * such as {@link Immutable} and {@link Mutable} which are mutually exclusive. + * + * @author Tony Tkacik + * + * @param Mutation Type + */ +public interface MutationBehaviour> { + +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java new file mode 100644 index 0000000000..cb759c05c3 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java @@ -0,0 +1,12 @@ +package org.opendaylight.yangtools.concepts; + +import java.util.Set; + +public interface Namespace { + + V get(K key); + + Namespace getParent(); + Set> getSubnamespaces(); + Namespace getSubnamespace(V key); +} diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java b/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java new file mode 100644 index 0000000000..99745b2003 --- /dev/null +++ b/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java @@ -0,0 +1,9 @@ +package org.opendaylight.yangtools.concepts; +import java.util.List; +import java.util.Set; + + +public interface OrderedSet extends Set,List { + + +} diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index 407af961c6..279daac1d6 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -9,7 +9,7 @@ 4.0.0 iana-afn-safi - 2013.07.04-SNAPSHOT + 2013.07.04.0-SNAPSHOT diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index 29d8921d63..2f74617ea7 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -9,7 +9,7 @@ 4.0.0 iana-if-type - 2013.07.04-SNAPSHOT + 2013.07.04.0-SNAPSHOT diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index d206fdbc28..67ae5075ae 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-inet-types - 2010.09.24-SNAPSHOT + 2010.09.24.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-netconf/pom.xml b/model/ietf/ietf-netconf/pom.xml new file mode 100644 index 0000000000..9b5af7798d --- /dev/null +++ b/model/ietf/ietf-netconf/pom.xml @@ -0,0 +1,30 @@ + + + + model-ietf + org.opendaylight.yangtools.model + 0.5.8-SNAPSHOT + + + 4.0.0 + ietf-netconf + 1.0-SNAPSHOT + ${project.artifactId} + ${project.artifactId} + + bundle + + + + org.opendaylight.yangtools.model + ietf-inet-types + 2010.09.24-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-yang-types + 2010.09.24-SNAPSHOT + + + diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index 42f9941ea3..7bc5b934e3 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-ted - 2013.07.12-SNAPSHOT + 2013.07.12.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 8774e63ef5..56dc6b2b68 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-topology-isis - 2013.07.12-SNAPSHOT + 2013.07.12.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index eac5382eac..231e7673d2 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-topology-l3-unicast-igp - 2013.07.12-SNAPSHOT + 2013.07.12.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index b81ffe19fe..417c090802 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-topology-ospf - 2013.07.12-SNAPSHOT + 2013.07.12.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 38f6f02c82..5abaff0407 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-topology - 2013.07.12-SNAPSHOT + 2013.07.12.0-SNAPSHOT ${project.artifactId} ${project.artifactId} @@ -17,12 +17,12 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24-SNAPSHOT + 2010.09.24.0-SNAPSHOT org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24-SNAPSHOT + 2010.09.24.0-SNAPSHOT diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml index 7e5656b047..0066ab7b01 100644 --- a/model/ietf/ietf-yang-types/pom.xml +++ b/model/ietf/ietf-yang-types/pom.xml @@ -9,7 +9,7 @@ 4.0.0 ietf-yang-types - 2010.09.24-SNAPSHOT + 2010.09.24.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index b05fdb1afa..d9f61e63bd 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -18,6 +18,7 @@ ietf-yang-types ietf-ted ietf-topology + @@ -84,31 +85,6 @@ - - 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 - - - - diff --git a/yang/yang-ext/pom.xml b/model/yang-ext/pom.xml similarity index 95% rename from yang/yang-ext/pom.xml rename to model/yang-ext/pom.xml index 379ff8ec49..4612d66adc 100644 --- a/yang/yang-ext/pom.xml +++ b/model/yang-ext/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.yangtools - yang + org.opendaylight.yangtools.model + model-parent 0.5.8-SNAPSHOT 4.0.0 yang-ext - 2013.09.07-SNAPSHOT + 2013.09.07.0-SNAPSHOT ${project.artifactId} ${project.artifactId} diff --git a/yang/yang-ext/src/main/yang/yang-ext.yang b/model/yang-ext/src/main/yang/yang-ext.yang similarity index 100% rename from yang/yang-ext/src/main/yang/yang-ext.yang rename to model/yang-ext/src/main/yang/yang-ext.yang diff --git a/pom.xml b/pom.xml index 430f1b63b9..15fe063f7b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,14 +11,27 @@ UTF-8 1.7.2 http://nexus.opendaylight.org/content - 0.5.8-SNAPSHOT + + + 1.7 + 1.7 + + 2.4.0 2.4 + 2.9.1 2.2.1 - 2.16 + 2.16 + + + 1.7.2 + 14.0.1 + 2.4.3 + 2.1.6 + concepts yang code-generator restconf @@ -44,20 +57,6 @@ - - - - ebr-bundles-release - ebr-bundles-release - ${nexusproxy}/repositories/ebr-bundles-release/ - - - - - ebr-bundles-external - ebr-bundles-external - ${nexusproxy}/repositories/ebr-bundles-external/ - @@ -72,27 +71,7 @@ central ${nexusproxy}/repositories/central/ - - - - ops4j-releases - ops4j-releases - ${nexusproxy}/repositories/ops4j-releases/ - - - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ - - - - - jboss.releases - jboss.releases - ${nexusproxy}/repositories/jboss.releases/ - + opendaylight-release @@ -110,13 +89,21 @@ + junit junit 4.10 test - true + + org.mockito + mockito-all + 1.9.5 + test + + + org.slf4j slf4j-api @@ -127,6 +114,11 @@ guava 14.0.1 + + org.eclipse.xtend + org.eclipse.xtend.lib + ${xtend.version} + @@ -148,16 +140,102 @@ + + + + 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.4.1 + + + + ${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-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin org.apache.maven.plugins @@ -175,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${maven.javadoc.version} maven @@ -216,6 +294,4 @@ - - diff --git a/third-party/pom.xml b/third-party/pom.xml new file mode 100644 index 0000000000..d82f8b436b --- /dev/null +++ b/third-party/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + org.opendaylight.yangtools + yangtools + 0.5-SNAPSHOT + + org.opendaylight.yangtools.thirdparty + third-party-parent + pom + + scm:git:ssh://git.opendaylight.org:29418/yangtools.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/YANG_Tools:Third-Party + + + + xtend-lib-osgi + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + diff --git a/third-party/xtend-lib-osgi/pom.xml b/third-party/xtend-lib-osgi/pom.xml new file mode 100644 index 0000000000..a237b6e644 --- /dev/null +++ b/third-party/xtend-lib-osgi/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + + org.opendaylight.yangtools.thirdparty + third-party-parent + 0.5-SNAPSHOT + + xtend-lib-osgi + 2.4.2-SNAPSHOT + bundle + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + + org.apache.felix + maven-bundle-plugin + true + + + *;scope=compile|runtime + ${project.groupId}.${project.artifactId} + + org.eclipse.xtend2.lib, + org.eclipse.xtend.lib, + org.eclipse.xtext.xbase.* + + + + + + org.eclipse.xtend + xtend-maven-plugin + 2.4.2 + + + + compile + + + ${basedir}/src/main/xtend-gen + + + + + + maven-clean-plugin + 2.4.1 + + + + ${basedir}/src/main/xtend-gen + + ** + + + + + + + + + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.4.2 + + + diff --git a/yang/pom.xml b/yang/pom.xml index 04b1a0b9ab..56e0ed45b0 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -18,7 +18,6 @@ yang-data-api yang-data-util yang-data-impl - yang-ext yang-model-api yang-maven-plugin yang-maven-plugin-it @@ -83,100 +82,4 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - maven - - - - - aggregate - - site - - - - - - - - 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 - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - - diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index b70f942d3f..2f6bdbbb28 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -11,30 +11,4 @@ yang-binding ${project.artifactId} Java binding for YANG - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 94f3de6f54..95801ab5be 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -18,30 +18,4 @@ slf4j-api - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index a0f8fdae72..1dd12bb3d5 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -18,30 +18,4 @@ yang-common - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 063dbfcbe2..2d3efd8452 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -18,26 +18,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - org.apache.maven.plugins maven-surefire-plugin @@ -104,5 +84,4 @@ test - diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index 8d344ae336..914224c38e 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -18,30 +18,4 @@ yang-data-api - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index ae3b7064e1..d4d51fcb5d 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -35,12 +35,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - package @@ -50,17 +44,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index fb0ab44b71..eace022475 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -93,6 +93,15 @@ + + org.apache.felix + maven-bundle-plugin + + + maven-plugin + + + org.apache.maven.plugins maven-plugin-plugin diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index f4754c90b1..b27f917256 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -18,30 +18,4 @@ yang-common - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 07bcf43cf8..a161cd5370 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -20,7 +20,6 @@ org.eclipse.xtend org.eclipse.xtend.lib - 2.4.2 junit @@ -30,56 +29,10 @@ - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - org.eclipse.xtend xtend-maven-plugin - 2.4.2 - - - - compile - - - ${basedir}/src/main/xtend-gen - - - - - - maven-clean-plugin - 2.4.1 - - - - ${basedir}/src/main/xtend-gen - - ** - - - - - diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index 106fb6ed93..7bc0b61192 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -18,30 +18,4 @@ yang-model-api - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - - diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 7cd07e1dc1..faca0f156b 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -53,7 +53,6 @@ org.eclipse.xtend org.eclipse.xtend.lib - 2.4.2 junit @@ -64,40 +63,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - maven-clean-plugin - 2.4.1 - - - - ${basedir}/src/main/xtend-gen - - ** - - - - - org.antlr antlr4-maven-plugin @@ -119,17 +84,6 @@ org.eclipse.xtend xtend-maven-plugin - 2.4.2 - - - - compile - - - ${basedir}/src/main/xtend-gen - - - org.codehaus.mojo @@ -149,7 +103,6 @@ - org.apache.maven.plugins maven-javadoc-plugin @@ -189,5 +142,4 @@ - -- 2.36.6