From 693cca4206fc91aaec0440654d6ac4c69da00d89 Mon Sep 17 00:00:00 2001 From: Michal Rehak Date: Thu, 29 Aug 2013 22:13:04 +0200 Subject: [PATCH] Changing group id according to jenkins merge rules. Change-Id: I24147d7dbc938f11dfd7abd1052a1adb532b96f9 Signed-off-by: Michal Rehak --- openflow-protocol-api/pom.xml | 6 +- openflow-protocol-impl/pom.xml | 6 +- openflow-protocol-spi/pom.xml | 38 +- pom.xml | 532 ++++++++++++++-------------- third-party/openflow-codec/pom.xml | 4 +- third-party/openflowj_netty/pom.xml | 2 +- 6 files changed, 295 insertions(+), 293 deletions(-) diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml index b54aa23e..aa0f6343 100644 --- a/openflow-protocol-api/pom.xml +++ b/openflow-protocol-api/pom.xml @@ -1,8 +1,8 @@ - 4.0.0 - org.opendaylight.openflow + org.opendaylight.openflowjava openflow-protocol-parent 0.1-SNAPSHOT @@ -116,4 +116,4 @@ 0.5.7-SNAPSHOT - + \ No newline at end of file diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml index 41e99deb..6f0f89a6 100644 --- a/openflow-protocol-impl/pom.xml +++ b/openflow-protocol-impl/pom.xml @@ -2,7 +2,7 @@ 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.openflow + org.opendaylight.openflowjava openflow-protocol-parent 0.1-SNAPSHOT @@ -11,12 +11,12 @@ - org.opendaylight.openflow + ${project.groupId} openflow-protocol-api ${project.version} - org.opendaylight.openflow + ${project.groupId} openflow-protocol-spi ${project.version} diff --git a/openflow-protocol-spi/pom.xml b/openflow-protocol-spi/pom.xml index 954ed438..78996e7c 100644 --- a/openflow-protocol-spi/pom.xml +++ b/openflow-protocol-spi/pom.xml @@ -1,19 +1,19 @@ - - 4.0.0 - - org.opendaylight.openflow - openflow-protocol-parent - 0.1-SNAPSHOT - - openflow-protocol-spi - Openflow Protocol Library SPI - - - - org.opendaylight.openflow - openflow-protocol-api - ${project.version} - - - + + 4.0.0 + + org.opendaylight.openflowjava + openflow-protocol-parent + 0.1-SNAPSHOT + + openflow-protocol-spi + Openflow Protocol Library SPI + + + + ${project.groupId} + openflow-protocol-api + ${project.version} + + + diff --git a/pom.xml b/pom.xml index 02fc2fc3..71e2ee36 100644 --- a/pom.xml +++ b/pom.xml @@ -1,265 +1,267 @@ - - 4.0.0 - org.opendaylight.openflow - openflow-protocol-parent - 0.1-SNAPSHOT - pom - - openflow-protocol-api - openflow-protocol-spi - openflow-protocol-impl - third-party/openflow-codec - third-party/openflowj_netty - - - Openflow Protocol Library - - - - Adam Brček - adam.brcek@pantheon.sk - - - - - - https://sonar.opendaylight.org/ - http://nexus.opendaylight.org/content - dav:http://nexus.opendaylight.org/content/sites/site - 3.2 - 2.6 - UTF-8 - 2.3.2 - 2.13 - 3.0.0 - 1.5.0 - 1.26.2 - ${user.name}-private-view - org.openflow.openflowj,net.sf.jung2 - 1.0.9 - 1.7.2 - - - - - central2 - central2 - ${nexusproxy}/repositories/central2/ - - - - - opendaylight-release - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - - - - - - ebr-bundles-release - ebr-bundles-release - ${nexusproxy}/repositories/ebr-bundles-release/ - - - - - ebr-bundles-external - ebr-bundles-external - ${nexusproxy}/repositories/ebr-bundles-external/ - - - - - central2 - central2 - ${nexusproxy}/repositories/central2/ - - - - - central - 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 - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - - - - - - - junit - junit - 4.10 - test - true - - - org.slf4j - slf4j-api - 1.7.2 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - attach-javadocs - deploy - - jar - - - - - - maven-source-plugin - - - attach-sources - deploy - - jar-no-fork - - - - - - - maven-deploy-plugin - - - deploy - deploy - - deploy - - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - - - viewbuild - - true - - - ${project.version} - - - - jenkins - - - BUILDSUFFIX - - - - ${BUILDSUFFIX} - - - - + + 4.0.0 + org.opendaylight.openflowjava + openflow-protocol-parent + 0.1-SNAPSHOT + pom + + openflow-protocol-api + openflow-protocol-spi + openflow-protocol-impl + third-party/openflow-codec + third-party/openflowj_netty + + + + https://sonar.opendaylight.org/ + http://nexus.opendaylight.org/content + dav:http://nexus.opendaylight.org/content/sites/site + 3.2 + 2.6 + UTF-8 + 2.3.2 + 2.13 + 3.0.0 + 1.5.0 + 1.26.2 + ${user.name}-private-view + org.openflow.openflowj,net.sf.jung2 + 1.0.9 + 1.7.2 + + + + + central2 + central2 + ${nexusproxy}/repositories/central2/ + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + + + + + + ebr-bundles-release + ebr-bundles-release + ${nexusproxy}/repositories/ebr-bundles-release/ + + + + + ebr-bundles-external + ebr-bundles-external + ${nexusproxy}/repositories/ebr-bundles-external/ + + + + + central2 + central2 + ${nexusproxy}/repositories/central2/ + + + + + central + 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 + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + + + + + + + junit + junit + 4.10 + test + true + + + org.slf4j + slf4j-api + 1.7.2 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + attach-javadocs + deploy + + jar + + + + + + maven-source-plugin + + + attach-sources + deploy + + jar-no-fork + + + + + + + maven-deploy-plugin + + + deploy + deploy + + deploy + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + + + viewbuild + + true + + + ${project.version} + + + + jenkins + + + BUILDSUFFIX + + + + ${BUILDSUFFIX} + + + + diff --git a/third-party/openflow-codec/pom.xml b/third-party/openflow-codec/pom.xml index e29d6c05..2993d8d4 100644 --- a/third-party/openflow-codec/pom.xml +++ b/third-party/openflow-codec/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.opendaylight.openflow + org.opendaylight.openflowjava openflow-protocol-parent 0.1-SNAPSHOT ../../ @@ -147,4 +147,4 @@ test - \ No newline at end of file + diff --git a/third-party/openflowj_netty/pom.xml b/third-party/openflowj_netty/pom.xml index e1100a5f..379c6197 100644 --- a/third-party/openflowj_netty/pom.xml +++ b/third-party/openflowj_netty/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.opendaylight.openflow + org.opendaylight.openflowjava openflow-protocol-parent 0.1-SNAPSHOT ../../ -- 2.36.6