diff options
| -rw-r--r-- | .DS_Store | bin | 6148 -> 6148 bytes | |||
| -rwxr-xr-x | pom.xml | 4 | ||||
| -rwxr-xr-x | scripts/deploy.sh | 12 | ||||
| -rw-r--r-- | vnfs/.DS_Store | bin | 10244 -> 10244 bytes | |||
| -rw-r--r-- | vnfs/VES/pom.xml | 15 | ||||
| -rw-r--r-- | vnfs/VESreporting_vFW/pom.xml | 15 | ||||
| -rw-r--r-- | vnfs/VESreporting_vLB/pom.xml | 15 | ||||
| -rw-r--r-- | vnfs/honeycomb_plugin/.DS_Store | bin | 6148 -> 6148 bytes | |||
| -rw-r--r-- | vnfs/honeycomb_plugin/sample_plugin/.DS_Store | bin | 8196 -> 10244 bytes | |||
| -rw-r--r-- | vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml | 15 | ||||
| -rwxr-xr-x | vnfs/honeycomb_plugin/sample_plugin/pom.xml | 12 | ||||
| -rw-r--r-- | vnfs/vFW/.DS_Store | bin | 8196 -> 8196 bytes | |||
| -rw-r--r-- | vnfs/vFW/pg_streams/pom.xml | 15 | ||||
| -rw-r--r-- | vnfs/vLB/.DS_Store | bin | 10244 -> 10244 bytes | |||
| -rw-r--r-- | vnfs/vLB/DNSClient/pom.xml | 18 | ||||
| -rw-r--r-- | vnfs/vLB/DNSManager/pom.xml | 18 | ||||
| -rw-r--r-- | vnfs/vLB/dns_streams/pom.xml | 14 |
18 files changed, 23 insertions, 130 deletions
| Binary files differ @@ -14,7 +14,7 @@ </prerequisites> <modules> - <!--module>vnfs/honeycomb_plugin/sample_plugin</module--> + <module>vnfs/honeycomb_plugin/sample_plugin</module> <module>vnfs/vFW/pg_streams</module> <module>vnfs/vLB/dns_streams</module> <module>vnfs/vLB/DNSClient</module> @@ -29,6 +29,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>true</skip> </configuration> @@ -36,6 +37,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> <configuration> <skip>true</skip> </configuration> diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 94a98965..0dd0524e 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -24,20 +24,16 @@ echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" ##### Upload scripts into Nexus raw repository ##### cd $PATH_TO_BOOT -#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{} -ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{} +ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{} cd $PATH_TO_HEAT -#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{} -ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{} +ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{} cd $PATH_TO_VFW -#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{} -ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{} +ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{} cd $PATH_TO_VLB -#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{} -ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{} +ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{} #################################################### ########## Clean up ########## diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store Binary files differindex 2f3daafe..c4de1313 100644 --- a/vnfs/.DS_Store +++ b/vnfs/.DS_Store diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml index da8d0ea4..2c103a30 100644 --- a/vnfs/VES/pom.xml +++ b/vnfs/VES/pom.xml @@ -17,6 +17,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <id>default-jar</id> @@ -45,24 +46,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml index c1fb551f..9e712e5d 100644 --- a/vnfs/VESreporting_vFW/pom.xml +++ b/vnfs/VESreporting_vFW/pom.xml @@ -16,6 +16,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <id>default-jar</id> @@ -43,24 +44,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml index 51e93976..69c91789 100644 --- a/vnfs/VESreporting_vLB/pom.xml +++ b/vnfs/VESreporting_vLB/pom.xml @@ -16,6 +16,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <id>default-jar</id> @@ -43,24 +44,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store Binary files differindex 5bdc9e5a..6febf681 100644 --- a/vnfs/honeycomb_plugin/.DS_Store +++ b/vnfs/honeycomb_plugin/.DS_Store diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store Binary files differindex 0c92e6f3..3c79254d 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store +++ b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store Binary files differnew file mode 100644 index 00000000..5d56db6b --- /dev/null +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml index cb3903a9..352d4476 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml @@ -226,21 +226,6 @@ done </execution> </executions> </plugin> - - <!-- Disable exec-maven-plugin --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </pluginManagement> </build> diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml index 8702d240..40a792b4 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/pom.xml @@ -53,18 +53,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store Binary files differindex 7ada677e..97cfa332 100644 --- a/vnfs/vFW/.DS_Store +++ b/vnfs/vFW/.DS_Store diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml index 9c505ab8..e3f707cd 100644 --- a/vnfs/vFW/pg_streams/pom.xml +++ b/vnfs/vFW/pg_streams/pom.xml @@ -17,6 +17,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <id>default-jar</id> @@ -44,24 +45,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store Binary files differindex 6f9c5d55..17638039 100644 --- a/vnfs/vLB/.DS_Store +++ b/vnfs/vLB/.DS_Store diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml index 3084f9c3..6c31f4c8 100644 --- a/vnfs/vLB/DNSClient/pom.xml +++ b/vnfs/vLB/DNSClient/pom.xml @@ -8,7 +8,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.demo.vnf.vlb</groupId> + <groupId>org.openecomp.demo.vnf.lb</groupId> <artifactId>dns-client</artifactId> <name>DNS Client</name> <packaging>jar</packaging> @@ -31,6 +31,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> @@ -39,24 +40,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> <configuration> <skip>false</skip> </configuration> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml index 17f3b143..be2c52d0 100644 --- a/vnfs/vLB/DNSManager/pom.xml +++ b/vnfs/vLB/DNSManager/pom.xml @@ -8,7 +8,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.demo.vnf.vlb</groupId> + <groupId>org.openecomp.demo.vnf.lb</groupId> <artifactId>dns-manager</artifactId> <name>DNS Manager</name> <packaging>jar</packaging> @@ -31,6 +31,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> @@ -39,24 +40,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> <configuration> <skip>false</skip> </configuration> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> </build> diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml index 86a18781..5df7763e 100644 --- a/vnfs/vLB/dns_streams/pom.xml +++ b/vnfs/vLB/dns_streams/pom.xml @@ -17,6 +17,7 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <id>default-jar</id> @@ -45,23 +46,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> <configuration> <skip>false</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>none</phase> - </execution> - </executions> - </plugin> </plugins> </build> |