summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunder Tattavarada <statta@research.att.com>2020-05-05 15:01:39 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-05 15:01:39 +0000
commitcf2bf4c30a2500c0bfab0828530b0400d2fdd706 (patch)
treec52c040868ab94ba0a871bdcbf06d9c2302cb371
parent943885f3468d768a8c3bd718247db356b87362e2 (diff)
parentb5a15c31e68fe80503a8058121cdd2a4ac11a281 (diff)
Merge "Upgraded SDK and CXF versions"
-rw-r--r--ecomp-portal-BE-common/pom.xml2
-rw-r--r--ecomp-portal-BE-os/pom.xml10
-rw-r--r--pom.xml24
3 files changed, 23 insertions, 13 deletions
diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index 19d32431..82e9827c 100644
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -284,7 +284,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4</version>
</dependency>
<!-- Mapper -->
<dependency>
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 4ad50dfd..398520cb 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -314,11 +314,6 @@
<artifactId>tiles-jsp</artifactId>
<version>3.0.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>3.0.0-milestone1</version>
- </dependency>
<!-- Mapper -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -629,11 +624,6 @@
<version>1.8.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- </dependency>
<!-- OpenID Connect Dependencies -->
<dependency>
<groupId>org.mitre</groupId>
diff --git a/pom.xml b/pom.xml
index 19d8c34e..7c484016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<properties>
<!-- Jenkins should invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
<build.number>0</build.number>
- <epsdk.version>2.6.0</epsdk.version>
+ <epsdk.version>3.3.0-SNAPSHOT</epsdk.version>
<springframework.version>4.3.24.RELEASE</springframework.version>
<springframework.security.version>4.2.13.RELEASE</springframework.security.version>
<hibernate.version>4.3.11.Final</hibernate.version>
@@ -297,7 +297,27 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <executions>
+ <execution>
+ <id>enforce-no-snapshots</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireReleaseVersion>
+ <message>No Snapshots Allowed!</message>
+ </requireReleaseVersion>
+ </rules>
+ <fail>false</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>