aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-02-26 12:16:36 +0000
committerCarsten Lund <lund@research.att.com>2017-02-26 12:16:36 +0000
commit0ce26ac4ceb8be6fb30c079d9bc19695cdd28313 (patch)
treefca275e099cd6159b5c92f2491dac2c4aac4b0dc
parenta44e50f298505882bbd5a68f6341b5b0d3b6dad3 (diff)
Fixes POMs for release job
Change-Id: I862d6b831ef95293543855a0bf4e8f012e0bf27b Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--ncomp-sirius-manager-agent-server/pom.xml34
-rw-r--r--ncomp-sirius-manager-base/pom.xml34
-rw-r--r--ncomp-sirius-manager-console/pom.xml48
-rw-r--r--ncomp-sirius-manager-drools/pom.xml48
-rw-r--r--ncomp-sirius-manager-generator/pom.xml48
-rw-r--r--ncomp-sirius-manager-server/pom.xml48
-rw-r--r--pom.xml34
-rw-r--r--version.properties11
8 files changed, 67 insertions, 238 deletions
diff --git a/ncomp-sirius-manager-agent-server/pom.xml b/ncomp-sirius-manager-agent-server/pom.xml
index cd4de2a..80a0f07 100644
--- a/ncomp-sirius-manager-agent-server/pom.xml
+++ b/ncomp-sirius-manager-agent-server/pom.xml
@@ -11,42 +11,8 @@
</parent>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ncomp-sirius-manager-base/pom.xml b/ncomp-sirius-manager-base/pom.xml
index 4088742..c410e91 100644
--- a/ncomp-sirius-manager-base/pom.xml
+++ b/ncomp-sirius-manager-base/pom.xml
@@ -18,20 +18,6 @@
</properties>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<resources>
<resource>
@@ -57,26 +43,6 @@
</resource>
</resources>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ncomp-sirius-manager-console/pom.xml b/ncomp-sirius-manager-console/pom.xml
index b3183db..4a5db5d 100644
--- a/ncomp-sirius-manager-console/pom.xml
+++ b/ncomp-sirius-manager-console/pom.xml
@@ -11,46 +11,26 @@
<maven.compiler.source>1.7</maven.compiler.source>
<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+ <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+ <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
+ <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
</properties>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<sourceDirectory>src/main/groovy</sourceDirectory>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>${openecomp.nexus.staging.serverId}</serverId>
+ <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+ <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+ </configuration>
+ </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ncomp-sirius-manager-drools/pom.xml b/ncomp-sirius-manager-drools/pom.xml
index 1089f82..763d835 100644
--- a/ncomp-sirius-manager-drools/pom.xml
+++ b/ncomp-sirius-manager-drools/pom.xml
@@ -10,45 +10,25 @@
<maven.compiler.source>1.7</maven.compiler.source>
<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+ <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+ <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
+ <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
</properties>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>${openecomp.nexus.staging.serverId}</serverId>
+ <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+ <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+ </configuration>
+ </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ncomp-sirius-manager-generator/pom.xml b/ncomp-sirius-manager-generator/pom.xml
index fe3ffe5..fd12124 100644
--- a/ncomp-sirius-manager-generator/pom.xml
+++ b/ncomp-sirius-manager-generator/pom.xml
@@ -11,46 +11,26 @@
<maven.compiler.source>1.7</maven.compiler.source>
<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+ <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+ <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
+ <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
</properties>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<sourceDirectory>src/main/groovy</sourceDirectory>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>${openecomp.nexus.staging.serverId}</serverId>
+ <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+ <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+ </configuration>
+ </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ncomp-sirius-manager-server/pom.xml b/ncomp-sirius-manager-server/pom.xml
index fcdde47..183c173 100644
--- a/ncomp-sirius-manager-server/pom.xml
+++ b/ncomp-sirius-manager-server/pom.xml
@@ -10,45 +10,25 @@
<maven.compiler.source>1.7</maven.compiler.source>
<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+ <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+ <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
+ <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
</properties>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>${openecomp.nexus.staging.serverId}</serverId>
+ <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+ <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+ </configuration>
+ </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c0490ce..0ce9f1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,42 +19,8 @@
</modules>
- <pluginRepositories>
- <!-- Black Duck plugin dependencies -->
- <pluginRepository>
- <id>JCenter</id>
- <name>JCenter Repository</name>
- <url>http://jcenter.bintray.com</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>Restlet</id>
- <name>Restlet Repository</name>
- <url>http://maven.restlet.com</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
- <!-- blackduck maven plugin -->
- <plugin>
- <groupId>com.blackducksoftware.integration</groupId>
- <artifactId>hub-maven-plugin</artifactId>
- <version>1.4.0</version>
- <inherited>false</inherited>
- <configuration>
- <hubProjectName>${project.name}</hubProjectName>
- <outputDirectory>${project.basedir}</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>create-bdio-file</id>
- <phase>package</phase>
- <goals>
- <goal>createHubOutput</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- site maven plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..c0f2742
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,11 @@
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+major=1
+minor=0
+patch=0
+base_version=${major}.${minor}.${patch}
+# Release must be completed with git revision # in Jenkins
+
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT