Code Review
/
clamp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release clamp
[clamp.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
c82ddc9
..
8a4355b
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-26,7
+26,7
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>5.0.
0-SNAPSHOT
</version>
+ <version>5.0.
6
</version>
<name>clamp</name>
<name>clamp</name>
@@
-76,8
+76,8
@@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eelf.core.version>1.0.0</eelf.core.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eelf.core.version>1.0.0</eelf.core.version>
- <camel.version>2.2
4
.0</camel.version>
- <springboot.version>2.2.
0
.RELEASE</springboot.version>
+ <camel.version>2.2
5
.0</camel.version>
+ <springboot.version>2.2.
6
.RELEASE</springboot.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@
-99,7
+99,7
@@
<docker.skip.tag>true</docker.skip.tag>
<skip.staging.artifacts>false</skip.staging.artifacts>
<python.http.proxy.param />
<docker.skip.tag>true</docker.skip.tag>
<skip.staging.artifacts>false</skip.staging.artifacts>
<python.http.proxy.param />
- <tomcat.version>9.0.
27
</tomcat.version>
+ <tomcat.version>9.0.
33
</tomcat.version>
<ui.react.src>ui-react</ui.react.src>
<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
<ui.react.src>ui-react</ui.react.src>
<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
@@
-366,6
+366,11
@@
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@
-497,6
+502,11
@@
<version>1.3</version>
</dependency>
<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
<version>1.3</version>
</dependency>
<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>5.2.3.RELEASE</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
@@
-534,6
+544,17
@@
<artifactId>sdc-tosca</artifactId>
<version>1.5.1</version>
</dependency>
<artifactId>sdc-tosca</artifactId>
<version>1.5.1</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+
<!-- TESTING -->
<dependency>
<groupId>org.assertj</groupId>
<!-- TESTING -->
<dependency>
<groupId>org.assertj</groupId>
@@
-790,6
+811,7
@@
<version>1.0</version>
<executions>
<execution>
<version>1.0</version>
<executions>
<execution>
+ <id>docker-tags</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
<phase>validate</phase>
<goals>
<goal>execute</goal>
@@
-798,14
+820,8
@@
<source>${project.basedir}/src/main/script/TagVersion.groovy</source>
</configuration>
</execution>
<source>${project.basedir}/src/main/script/TagVersion.groovy</source>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
- <executions>
<execution>
<execution>
+ <id>npm-repos-selection</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
<phase>validate</phase>
<goals>
<goal>execute</goal>
@@
-878,9
+894,7
@@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <!-- Temporary fix -->
- <version>1.5.13.RELEASE</version>
- <!-- <version>${springboot.version}</version> -->
+ <version>${springboot.version}</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-1229,6
+1243,7
@@
</goals>
<phase>deploy</phase>
<configuration>
</goals>
<phase>deploy</phase>
<configuration>
+ <skip>true</skip>
<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
<arguments>publish</arguments>
</configuration>
<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
<arguments>publish</arguments>
</configuration>