aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-02-26 12:15:07 +0000
committerCarsten Lund <lund@research.att.com>2017-02-26 12:15:07 +0000
commit4765652b0e9efbd3f845cb75888c7c07d5a9a8b1 (patch)
tree67db7b28a25c0d230bbe400ee991ba6149bb276e
parent990e84bad4910bd907fb07609e3d74d1dc83cd5f (diff)
Fixes POMs for release job
Change-Id: Ie05e6c75774574fe2b3301a8136eea20571057ab Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--ncomp-docker-adaptor/pom.xml34
-rw-r--r--pom.xml34
-rw-r--r--version.properties11
3 files changed, 11 insertions, 68 deletions
diff --git a/ncomp-docker-adaptor/pom.xml b/ncomp-docker-adaptor/pom.xml
index 3cf15de..bc8a0e8 100644
--- a/ncomp-docker-adaptor/pom.xml
+++ b/ncomp-docker-adaptor/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/pom.xml b/pom.xml
index 6e1c20b..c1feeca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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