aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/pom.xml13
-rw-r--r--catalog-fe/pom.xml15
-rw-r--r--pom.xml39
3 files changed, 60 insertions, 7 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 6f35b3a5a1..99b14b0819 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -869,8 +869,19 @@
<activeByDefault>false</activeByDefault>
</activation>
-
<build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ </build>
+ </profile>
+
+ <profile>
+ <id>build</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+
+
+ <build>
<finalName>${project.artifactId}-${full.release.version}</finalName>
<plugins>
<plugin>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index e5d4bdaf83..643bf733ab 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -442,13 +442,21 @@
<activeByDefault>false</activeByDefault>
</activation>
-
<build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ </build>
+ </profile>
+
+ <profile>
+ <id>build</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
<finalName>${project.artifactId}-${full.release.version}</finalName>
-
+
<plugins>
-
<!-- ================================================== -->
<!-- Get the next versions from the properties file. -->
<!-- ================================================== -->
@@ -476,7 +484,6 @@
</build>
</profile>
-
<profile>
<id>Fortify</id>
<activation>
diff --git a/pom.xml b/pom.xml
index 9f6879472a..c0767d17ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,8 +353,6 @@
</profile>
-
-
<profile>
<id>catalog</id>
<activation>
@@ -373,7 +371,44 @@
<module>asdc-tests</module>
<module>test-apis-ci</module>
<module>ui-ci</module>
+ </modules>
+
+ <properties>
+ <ecomp.version>1.2.7</ecomp.version>
+ <artifact-generator-api.version>1707.0.1-SNAPSHOT</artifact-generator-api.version>
+ <artifact-generator-core.version>1707.0.1-SNAPSHOT</artifact-generator-core.version>
+ <dox-common-lib.version>1707.0.0-SNAPSHOT</dox-common-lib.version>
+ </properties>
+
+ </profile>
+
+ <profile>
+ <id>build</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>security-utils</module>
+ <module>common-app-api</module>
+ <module>common-be</module>
+ <module>catalog-dao</module>
+ <module>catalog-model</module>
+ <module>catalog-be</module>
+ <module>asdctool</module>
+ <module>catalog-ui</module>
+ <module>catalog-fe</module>
+ <module>asdc-tests</module>
+ <module>test-apis-ci</module>
+ <module>ui-ci</module>
</modules>
+
+
+ <properties>
+ <ecomp.version>1.2.7</ecomp.version>
+ <artifact-generator-api.version>1707.0.1-SNAPSHOT</artifact-generator-api.version>
+ <artifact-generator-core.version>1707.0.1-SNAPSHOT</artifact-generator-core.version>
+ <dox-common-lib.version>1707.0.0-SNAPSHOT</dox-common-lib.version>
+ </properties>
<build>
<plugins>