diff options
| -rw-r--r-- | ncomp-utils-java-extra/pom.xml | 38 | ||||
| -rw-r--r-- | ncomp-utils-java/pom.xml | 38 | ||||
| -rw-r--r-- | ncomp-utils-journaling/pom.xml | 38 | ||||
| -rw-r--r-- | pom.xml | 34 | ||||
| -rw-r--r-- | version.properties | 11 |
5 files changed, 17 insertions, 142 deletions
diff --git a/ncomp-utils-java-extra/pom.xml b/ncomp-utils-java-extra/pom.xml index 1d8bd87..9502359 100644 --- a/ncomp-utils-java-extra/pom.xml +++ b/ncomp-utils-java-extra/pom.xml @@ -12,25 +12,11 @@ <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>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.serverId> + <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>https://nexus.openecomp.org/content/repositories/snapshots/</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> <plugin> @@ -39,31 +25,11 @@ <version>1.6.7</version> <extensions>true</extensions> <configuration> - <serverId>${openecomp.nexus.staging.profileId}</serverId> + <serverId>${openecomp.nexus.staging.serverId}</serverId> <nexusUrl>${openecomp.nexus.proxy}</nexusUrl> <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId> </configuration> </plugin> - <!-- 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-utils-java/pom.xml b/ncomp-utils-java/pom.xml index f847c73..3b5d72a 100644 --- a/ncomp-utils-java/pom.xml +++ b/ncomp-utils-java/pom.xml @@ -12,25 +12,11 @@ <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>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.serverId> + <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>https://nexus.openecomp.org/content/repositories/snapshots/</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> <plugin> @@ -39,31 +25,11 @@ <version>1.6.7</version> <extensions>true</extensions> <configuration> - <serverId>${openecomp.nexus.staging.profileId}</serverId> + <serverId>${openecomp.nexus.staging.serverId}</serverId> <nexusUrl>${openecomp.nexus.proxy}</nexusUrl> <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId> </configuration> </plugin> - <!-- 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-utils-journaling/pom.xml b/ncomp-utils-journaling/pom.xml index 179f26c..41d66b6 100644 --- a/ncomp-utils-journaling/pom.xml +++ b/ncomp-utils-journaling/pom.xml @@ -12,25 +12,11 @@ <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>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.serverId> + <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>https://nexus.openecomp.org/content/repositories/snapshots/</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> <plugin> @@ -39,31 +25,11 @@ <version>1.6.7</version> <extensions>true</extensions> <configuration> - <serverId>${openecomp.nexus.staging.profileId}</serverId> + <serverId>${openecomp.nexus.staging.serverId}</serverId> <nexusUrl>${openecomp.nexus.proxy}</nexusUrl> <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId> </configuration> </plugin> - <!-- 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> @@ -13,43 +13,9 @@ - <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 |