From 6c1b1706436c63c6b36a2932fd4a7b2775feb3d7 Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Tue, 5 May 2015 17:12:42 +0530 Subject: [PATCH] POM File refactoring Refactoring all *impl and *-api pom files Change-Id: I183a760754e8da04deff67edc42f92ae2b14b541 Signed-off-by: Vishal Thapar --- bgpmanager/bgpmanager-api/pom.xml | 24 ++------- bgpmanager/bgpmanager-impl/pom.xml | 31 +++--------- commons/binding-parent/pom.xml | 35 +++++++++++++ commons/config-parent/pom.xml | 70 ++++++++++++++++++++++++++ fibmanager/fibmanager-api/pom.xml | 21 +++----- fibmanager/fibmanager-impl/pom.xml | 42 +++------------- idmanager/idmanager-api/pom.xml | 17 ++----- idmanager/idmanager-impl/pom.xml | 40 +++------------ interfacemgr/interfacemgr-api/pom.xml | 21 +++----- interfacemgr/interfacemgr-impl/pom.xml | 46 +++-------------- model-bgp/pom.xml | 28 +++-------- nexthopmgr/nexthopmgr-api/pom.xml | 21 +++----- nexthopmgr/nexthopmgr-impl/pom.xml | 45 ++++------------- pom.xml | 6 ++- vpnmanager/vpnmanager-api/pom.xml | 23 +++------ vpnmanager/vpnmanager-impl/pom.xml | 34 ++----------- 16 files changed, 193 insertions(+), 311 deletions(-) create mode 100644 commons/binding-parent/pom.xml create mode 100644 commons/config-parent/pom.xml diff --git a/bgpmanager/bgpmanager-api/pom.xml b/bgpmanager/bgpmanager-api/pom.xml index 609a4ace..d359c148 100644 --- a/bgpmanager/bgpmanager-api/pom.xml +++ b/bgpmanager/bgpmanager-api/pom.xml @@ -9,34 +9,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.controller + org.opendaylight.vpnservice config-parent - 0.3.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/config-parent 4.0.0 org.opendaylight.vpnservice bgpmanager-api - 1.0-SNAPSHOT + ${vpnservices.version} bundle - true diff --git a/bgpmanager/bgpmanager-impl/pom.xml b/bgpmanager/bgpmanager-impl/pom.xml index 7ad9092f..78469fd1 100644 --- a/bgpmanager/bgpmanager-impl/pom.xml +++ b/bgpmanager/bgpmanager-impl/pom.xml @@ -9,33 +9,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.controller + org.opendaylight.vpnservice config-parent - 0.3.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/config-parent 4.0.0 org.opendaylight.vpnservice bgpmanager-impl - 1.0-SNAPSHOT + ${vpnservices.version} bundle ${project.groupId} bgpmanager-api - 1.0-SNAPSHOT + ${vpnservices.version} ${project.groupId} model-bgp - 2013.07.15.7-SNAPSHOT + ${model.bgp.version} ${project.groupId} fibmanager-api - 0.0.1-SNAPSHOT + ${vpnservices.version} @@ -45,21 +45,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini - **/yang/ - - - - - diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml new file mode 100644 index 00000000..87104463 --- /dev/null +++ b/commons/binding-parent/pom.xml @@ -0,0 +1,35 @@ + + + + + org.opendaylight.yangtools + binding-parent + 0.7.0-SNAPSHOT + + + + 4.0.0 + org.opendaylight.vpnservice + binding-parent + 0.0.1-SNAPSHOT + pom + + + 0.0.1-SNAPSHOT + 2010.09.24.7-SNAPSHOT + 2010.09.24.7-SNAPSHOT + 2014.05.08.7-SNAPSHOT + 2014.05.08.7-SNAPSHOT + 2013.09.07.7-SNAPSHOT + 0.7.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.0.1-SNAPSHOT + 2013.07.15.7-SNAPSHOT + + diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml new file mode 100644 index 00000000..98a1c10a --- /dev/null +++ b/commons/config-parent/pom.xml @@ -0,0 +1,70 @@ + + + + + + org.opendaylight.controller + config-parent + 0.3.0-SNAPSHOT + + + + 4.0.0 + org.opendaylight.vpnservice + config-parent + 0.0.1-SNAPSHOT + pom + + + + 0.0.1-SNAPSHOT + 2010.09.24.7-SNAPSHOT + 2010.09.24.7-SNAPSHOT + 2014.05.08.7-SNAPSHOT + 2014.05.08.7-SNAPSHOT + 2013.09.07.7-SNAPSHOT + 0.7.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.0.1-SNAPSHOT + 2013.07.15.7-SNAPSHOT + + + + + + junit + junit + test + + + + org.mockito + mockito-all + test + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml + + true + **/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat + **/yang/ + + + + + + diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/fibmanager-api/pom.xml index 89ff83d9..aa25305a 100644 --- a/fibmanager/fibmanager-api/pom.xml +++ b/fibmanager/fibmanager-api/pom.xml @@ -8,27 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - org.opendaylight.yangtools + org.opendaylight.vpnservice binding-parent - 0.7.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/binding-parent 4.0.0 org.opendaylight.vpnservice fibmanager-api - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - - org.opendaylight.yangtools @@ -53,12 +44,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools.model ietf-interfaces - 2014.05.08.7-SNAPSHOT + ${ietf.interfaces.version} org.opendaylight.yangtools.model iana-if-type-2014-05-08 - 2014.05.08.7-SNAPSHOT + ${iana.if.type.version} org.opendaylight.controller.model diff --git a/fibmanager/fibmanager-impl/pom.xml b/fibmanager/fibmanager-impl/pom.xml index 95b37969..9e91a468 100644 --- a/fibmanager/fibmanager-impl/pom.xml +++ b/fibmanager/fibmanager-impl/pom.xml @@ -1,6 +1,6 @@ - - junit - junit - test + ${vpnservices.version} - - org.mockito - mockito-all - test - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat - **/yang/ - - - - + diff --git a/idmanager/idmanager-api/pom.xml b/idmanager/idmanager-api/pom.xml index 04766482..6a7708fa 100644 --- a/idmanager/idmanager-api/pom.xml +++ b/idmanager/idmanager-api/pom.xml @@ -8,27 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - org.opendaylight.yangtools + org.opendaylight.vpnservice binding-parent - 0.7.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/binding-parent 4.0.0 org.opendaylight.vpnservice idmanager-api - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - - org.opendaylight.yangtools diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml index 06b5f88a..039d4e05 100644 --- a/idmanager/idmanager-impl/pom.xml +++ b/idmanager/idmanager-impl/pom.xml @@ -1,6 +1,6 @@ - - junit - junit - test - - - org.mockito - mockito-all - test - org.opendaylight.vpnservice idmanager-api - 0.0.1-SNAPSHOT + ${vpnservices.version} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat - **/yang/ - - - - + diff --git a/interfacemgr/interfacemgr-api/pom.xml b/interfacemgr/interfacemgr-api/pom.xml index 4cfdfcf6..32dace0f 100644 --- a/interfacemgr/interfacemgr-api/pom.xml +++ b/interfacemgr/interfacemgr-api/pom.xml @@ -8,27 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - org.opendaylight.controller + org.opendaylight.vpnservice config-parent - 0.3.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/config-parent 4.0.0 org.opendaylight.vpnservice interfacemgr-api - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.0.1-SNAPSHOT - org.opendaylight.yangtools @@ -58,12 +49,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools.model ietf-interfaces - 2014.05.08.7-SNAPSHOT + ${ietf.interfaces.version} org.opendaylight.yangtools.model iana-if-type-2014-05-08 - 2014.05.08.7-SNAPSHOT + ${iana.if.type.version} org.opendaylight.controller.model diff --git a/interfacemgr/interfacemgr-impl/pom.xml b/interfacemgr/interfacemgr-impl/pom.xml index fec2ca0d..59451e2a 100644 --- a/interfacemgr/interfacemgr-impl/pom.xml +++ b/interfacemgr/interfacemgr-impl/pom.xml @@ -1,6 +1,6 @@ - - junit - junit - test - - - - org.mockito - mockito-all - test + ${vpnservices.version} - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat - **/yang/ - - - - - diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml index 46ed199c..1a205a39 100644 --- a/model-bgp/pom.xml +++ b/model-bgp/pom.xml @@ -1,7 +1,7 @@ - - org.opendaylight.yangtools - binding-parent - 0.7.0-SNAPSHOT - - + + org.opendaylight.vpnservice + binding-parent + 0.0.1-SNAPSHOT + ../commons/binding-parent + 4.0.0 org.opendaylight.vpnservice model-bgp - 2013.07.15.7-SNAPSHOT + ${model.bgp.version} ${project.artifactId} ${project.artifactId} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 0.7.0-SNAPSHOT - - org.opendaylight.yangtools @@ -52,10 +45,5 @@ ietf-yang-types ${ietf.yang.types.version} - - junit - junit - test - diff --git a/nexthopmgr/nexthopmgr-api/pom.xml b/nexthopmgr/nexthopmgr-api/pom.xml index f4022970..24e58e6b 100644 --- a/nexthopmgr/nexthopmgr-api/pom.xml +++ b/nexthopmgr/nexthopmgr-api/pom.xml @@ -8,27 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - org.opendaylight.yangtools + org.opendaylight.vpnservice binding-parent - 0.7.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/binding-parent 4.0.0 org.opendaylight.vpnservice nexthopmgr-api - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - - org.opendaylight.yangtools @@ -58,12 +49,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools.model ietf-interfaces - 2014.05.08.7-SNAPSHOT + ${ietf.interfaces.version} org.opendaylight.yangtools.model iana-if-type-2014-05-08 - 2014.05.08.7-SNAPSHOT + ${iana.if.type.version} org.opendaylight.controller.model diff --git a/nexthopmgr/nexthopmgr-impl/pom.xml b/nexthopmgr/nexthopmgr-impl/pom.xml index a6f04dd2..601bc90f 100644 --- a/nexthopmgr/nexthopmgr-impl/pom.xml +++ b/nexthopmgr/nexthopmgr-impl/pom.xml @@ -1,6 +1,6 @@ - - junit - junit - test - - - - org.mockito - mockito-all - test - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini,**/*.sh,**/*.bat - **/yang/ - - - - + diff --git a/pom.xml b/pom.xml index 22e07fb4..7c29c75c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - model-bgp - mdsalutil + commons/binding-parent + commons/config-parent + model-bgp + mdsalutil vpnmanager interfacemgr nexthopmgr diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/vpnmanager-api/pom.xml index 99490b12..b042c1eb 100644 --- a/vpnmanager/vpnmanager-api/pom.xml +++ b/vpnmanager/vpnmanager-api/pom.xml @@ -8,27 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - org.opendaylight.yangtools + org.opendaylight.vpnservice binding-parent - 0.7.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/binding-parent 4.0.0 org.opendaylight.vpnservice vpnmanager-api - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle - - - 2010.09.24.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT - - org.opendaylight.yangtools @@ -58,17 +49,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools.model ietf-interfaces - 2014.05.08.7-SNAPSHOT + ${ietf.interfaces.version} org.opendaylight.yangtools.model iana-if-type-2014-05-08 - 2014.05.08.7-SNAPSHOT + ${iana.if.type.version} org.opendaylight.vpnservice model-bgp - 2013.07.15.7-SNAPSHOT + ${model.bgp.version} diff --git a/vpnmanager/vpnmanager-impl/pom.xml b/vpnmanager/vpnmanager-impl/pom.xml index ba626fb0..8a138746 100644 --- a/vpnmanager/vpnmanager-impl/pom.xml +++ b/vpnmanager/vpnmanager-impl/pom.xml @@ -9,16 +9,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.controller + org.opendaylight.vpnservice config-parent - 0.3.0-SNAPSHOT - + 0.0.1-SNAPSHOT + ../../commons/config-parent 4.0.0 org.opendaylight.vpnservice vpnmanager-impl - 0.0.1-SNAPSHOT + ${vpnservices.version} bundle @@ -46,32 +46,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html interfacemgr-api ${project.version} - - - junit - junit - - - org.mockito - mockito-all - test - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - ${project.basedir}/../../commons/src/main/resources/vpns_checks.xml - - true - **/*.java,**/*.xml,**/*.ini - **/yang/ - - - - -- 2.36.6