summaryrefslogtreecommitdiffstats
path: root/vnfs/honeycomb_plugin
diff options
context:
space:
mode:
authorplatania <platania@research.att.com>2017-02-17 16:23:59 -0500
committerplatania <platania@research.att.com>2017-02-17 16:25:03 -0500
commit71984d1bffa966c366d47464a3acf4b440c9c7c9 (patch)
tree1b30b6e686a320fc9dacf818e5d0410206b0384d /vnfs/honeycomb_plugin
parenta7417591cd3a600bbbb4fbbc6e30c376ea9b6218 (diff)
POM reorganization
Change-Id: I38076a941f6038aa8d5e67e2133c48231193430b Signed-off-by: platania <platania@research.att.com>
Diffstat (limited to 'vnfs/honeycomb_plugin')
-rw-r--r--vnfs/honeycomb_plugin/.DS_Storebin6148 -> 6148 bytes
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/.DS_Storebin10244 -> 8196 bytes
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml5
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/pom.xml3
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml3
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml1
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml1
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/settings.xml105
8 files changed, 6 insertions, 112 deletions
diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store
index f20da4b2..a33a0741 100644
--- a/vnfs/honeycomb_plugin/.DS_Store
+++ b/vnfs/honeycomb_plugin/.DS_Store
Binary files differ
diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
index c7a6a7ae..0c92e6f3 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
+++ b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
Binary files differ
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 16cd604e..352d4476 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -21,8 +21,8 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
- <relativePath>../../../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
</parent>
<properties>
@@ -241,4 +241,5 @@ done
</snapshotRepository>
</distributionManagement>
-->
+
</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
index 2da40d38..40a792b4 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>sample-plugin-aggregator</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
@@ -55,4 +55,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 0d8ddd77..0d7e4b17 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -18,14 +18,13 @@
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
<version>1.0.0</version>
-<relativePath>../../../pom.xml</relativePath>
+<relativePath>../../../../pom.xml</relativePath>
</parent>
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-distribution</artifactId>
- <version>1.0.0</version>
<properties>
<main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
index 74506eb9..fc981026 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-api</artifactId>
- <version>1.0.0</version>
<packaging>bundle</packaging>
<dependencyManagement>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
index 59f3c1f0..49ec1494 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-impl</artifactId>
- <version>1.0.0</version>
<packaging>bundle</packaging>
<properties>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/settings.xml b/vnfs/honeycomb_plugin/sample_plugin/settings.xml
deleted file mode 100644
index 28acd41a..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/settings.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>fd.io-release</id>
- <repositories>
- <repository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>fd.io-snapshots</id>
- <repositories>
- <repository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-shapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>fd.io-release</activeProfile>
- <activeProfile>fd.io-snapshots</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-</settings> \ No newline at end of file