diff options
| -rw-r--r-- | catalog-be/pom.xml | 3 | ||||
| -rw-r--r-- | common-be/pom.xml | 2 | ||||
| -rw-r--r-- | common/pom.xml | 1 | ||||
| -rw-r--r-- | onboarding/pom.xml | 3 | ||||
| -rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/tools/swagger-ui/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/tools/zusammen-tools/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 8 |
11 files changed, 9 insertions, 14 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 5058dc2d36..f6bb4f0933 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -18,6 +18,7 @@ <swagger-ui.version>3.25.0</swagger-ui.version> <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version> <replacer.plugin.version>1.5.3</replacer.plugin.version> + <ui.version>${project.version}</ui.version> </properties> <dependencies> @@ -1058,7 +1059,7 @@ </packagingExcludes> <archive> <manifestEntries> - <SDC-Version>${project.version}</SDC-Version> + <SDC-Version>${ui.version}</SDC-Version> </manifestEntries> <manifest> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> diff --git a/common-be/pom.xml b/common-be/pom.xml index dc8509f8d4..97870a717b 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -210,8 +210,8 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <executions> <execution> <id>default-jar</id> diff --git a/common/pom.xml b/common/pom.xml index 20b50b07e2..5c9e262624 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -43,7 +43,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> </plugin> </plugins> </build> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index ab5b4a2110..d77b804a52 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -46,8 +46,6 @@ <mvn.resource.version>3.1.0</mvn.resource.version> <mvn.deploy.version>2.4</mvn.deploy.version> <mvn.install.version>2.4</mvn.install.version> - <mvn.jar.version>2.4</mvn.jar.version> - <mvn.war.version>2.1.1</mvn.war.version> <!-- Onboarding 3rd party versions --> <aspectjrt.version>${aspectj.version}</aspectjrt.version> @@ -298,7 +296,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index 76185540c6..00188e2266 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -215,7 +215,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.0.0</version> <configuration> <packagingExcludes>WEB-INF/lib/togglz*.jar</packagingExcludes> </configuration> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 5ba0c4b05a..59bf8b0359 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -263,7 +263,6 @@ <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> - <version>${mvn.war.version}</version> <configuration> <webResources> <resource> diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index b005b224b1..2c738eb149 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -62,7 +62,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> <configuration> <archive> <manifest> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 640e1b232e..bf22789e09 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -76,7 +76,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> </plugin> </plugins> </build> diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 777a1cc0c7..7a059a2917 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -56,7 +56,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> <executions> <execution> <id>default-jar</id> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 07fcc74003..17053feb45 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -172,7 +172,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> @@ -138,7 +138,6 @@ Modifications copyright (c) 2018-2019 Nokia <hamcrest.version>2.2</hamcrest.version> <hamcrest-all.version>1.3</hamcrest-all.version> <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> - <maven-jar-plugin.version>2.4</maven-jar-plugin.version> <jMapper.version>1.6.0.1</jMapper.version> <!-- sonar --> @@ -393,8 +392,13 @@ Modifications copyright (c) 2018-2019 Nokia </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.2.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.2.2</version> + <version>3.3.2</version> </plugin> <plugin> <groupId>com.github.eirslett</groupId> |