diff options
| -rw-r--r-- | ncomp-maven-base/pom.xml | 36 | ||||
| -rw-r--r-- | ncomp-maven-sirius-project/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-maven-sirius-project/src/main/resources/archetype-resources/pom.xml | 34 | ||||
| -rw-r--r-- | ncomp-maven-xcore/pom.xml | 36 | ||||
| -rw-r--r-- | pom.xml | 36 | ||||
| -rw-r--r-- | version.properties | 22 |
6 files changed, 15 insertions, 151 deletions
diff --git a/ncomp-maven-base/pom.xml b/ncomp-maven-base/pom.xml index 2924faa..1ef9508 100644 --- a/ncomp-maven-base/pom.xml +++ b/ncomp-maven-base/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -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> <plugins> <plugin> @@ -45,26 +31,6 @@ <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-maven-sirius-project/pom.xml b/ncomp-maven-sirius-project/pom.xml index 36f1a59..7c1926e 100644 --- a/ncomp-maven-sirius-project/pom.xml +++ b/ncomp-maven-sirius-project/pom.xml @@ -11,4 +11,4 @@ <version>0.1.0-SNAPSHOT</version> <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> </parent> -</project>
\ No newline at end of file +</project> diff --git a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/pom.xml b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/pom.xml index 00744da..5b37f42 100644 --- a/ncomp-maven-sirius-project/src/main/resources/archetype-resources/pom.xml +++ b/ncomp-maven-sirius-project/src/main/resources/archetype-resources/pom.xml @@ -10,42 +10,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-maven-xcore/pom.xml b/ncomp-maven-xcore/pom.xml index 4835045..8fc7789 100644 --- a/ncomp-maven-xcore/pom.xml +++ b/ncomp-maven-xcore/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-xcore</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -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> <sourceDirectory>src/main/xcore-gen</sourceDirectory> <resources> @@ -51,26 +37,6 @@ <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> @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -19,20 +19,6 @@ - <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> @@ -47,26 +33,6 @@ </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/version.properties b/version.properties index 35d03a3..c0f2742 100644 --- a/version.properties +++ b/version.properties @@ -1,11 +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
+# 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 |