X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f9d1df9054a74ef894d72a9e1fec64979efded90;hb=4952c0440dc6dfc19a98e6b35e8f1bf08fafa2f0;hp=38069099fd122d7b24719af571d78981e92cb428;hpb=86cf9ece99fdc169427426010d07d59b3d0d1d91;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 38069099..f9d1df90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.2.0</version>
+				<version>1.2.3</version>
 		</parent>
 
 		<description>
@@ -64,8 +64,8 @@
 				<java.version>1.8</java.version>
 
 				<eelf.core.version>1.0.0</eelf.core.version>
-				<camel.version>2.22.1</camel.version>
-				<springboot.version>2.0.6.RELEASE</springboot.version>
+				<camel.version>2.23.1</camel.version>
+				<springboot.version>2.1.4.RELEASE</springboot.version>
 
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 				<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -88,7 +88,7 @@
 				<docker.skip.tag>true</docker.skip.tag>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
 				<python.http.proxy.param/>
-				<tomcat.version>8.5.34</tomcat.version>
+				<tomcat.version>9.0.16</tomcat.version>
 		</properties>
 
 		<profiles>
@@ -145,39 +145,45 @@
 
 		<distributionManagement>
 				<repository>
-						<id>onap-releases</id>
+						<id>ecomp-releases</id>
 						<name>Clamp Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<snapshotRepository>
-						<id>onap-snapshots</id>
+						<id>ecomp-snapshots</id>
 						<name>Clamp Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 				</snapshotRepository>
 				<site>
-						<id>onap-site</id>
+						<id>ecomp-site</id>
 						<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
 				</site>
 		</distributionManagement>
 
 		<repositories>
 				<repository>
-						<id>central</id>
-						<name>Maven 2 repository 2</name>
-						<url>http://repo2.maven.org/maven2/</url>
+					<id>onap-public</id>
+					<name>onap-public</name>
+					<url>https://nexus.onap.org/content/repositories/public/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
 				</repository>
 				<repository>
-						<id>onap-releases</id>
+						<id>ecomp-releases</id>
 						<name>ONAP Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<repository>
-						<id>onap-staging</id>
+						<id>ecomp-staging</id>
 						<name>ONAP Staging Repository</name>
 						<url>https://nexus.onap.org/content/repositories/staging/</url>
 				</repository>
 				<repository>
-						<id>onap-snapshots</id>
+						<id>ecomp-snapshots</id>
 						<name>ONAP Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 						<snapshots>
@@ -188,16 +194,27 @@
 						</releases>
 				</repository>
 				<repository>
-						<id>spring-repo</id>
-						<name>Spring repo</name>
-						<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-				</repository>
-				<repository>
-						<id>repository.jboss.org-public</id>
-						<name>JBoss.org Maven repository</name>
-						<url>https://repository.jboss.org/nexus/content/groups/public</url>
+					<id>central</id>
+					<url>http://repo1.maven.org/maven2/</url>
 				</repository>
 		</repositories>
+		<pluginRepositories>
+			<pluginRepository>
+				<id>onap-public</id>
+				<name>onap-public</name>
+				<url>https://nexus.onap.org/content/repositories/public/</url>
+				<releases>
+					<enabled>true</enabled>
+				</releases>
+				<snapshots>
+					<enabled>false</enabled>
+				</snapshots>
+			</pluginRepository>
+			<pluginRepository>
+				<id>central</id>
+				<url>http://repo1.maven.org/maven2/</url>
+			</pluginRepository>
+		</pluginRepositories>
 
 		<dependencyManagement>
 				<dependencies>
@@ -221,6 +238,21 @@
 		</dependencyManagement>
 
 		<dependencies>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-svggen</artifactId>
+				<version>1.11</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-svg-dom</artifactId>
+				<version>1.11</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-transcoder</artifactId>
+				<version>1.11</version>
+			</dependency>
 				<dependency>
 						<groupId>com.att.eelf</groupId>
 						<artifactId>eelf-core</artifactId>
@@ -252,6 +284,10 @@
 						<version>${tomcat.version}</version>
 				</dependency>
 				<!-- For CAMEL -->
+				<dependency>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-http4</artifactId>
+				</dependency>
 				<dependency>
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-spring-boot-starter</artifactId>
@@ -342,7 +378,7 @@
 				<dependency>
 					<groupId>org.onap.aaf.authz</groupId>
 					<artifactId>aaf-cadi-aaf</artifactId>
-					<version>2.1.1</version>
+					<version>2.1.10</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.servlet</groupId>
@@ -373,6 +409,7 @@
 				<dependency>
 						<groupId>com.googlecode.json-simple</groupId>
 						<artifactId>json-simple</artifactId>
+						<version>1.1.1</version>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
@@ -600,21 +637,7 @@
 					<scope>test</scope>
 				</dependency>
 		</dependencies>
-		<pluginRepositories>
-				<pluginRepository>
-						<id>central-for-plugins</id>
-						<name>Maven 2 repository 2</name>
-						<url>http://repo2.maven.org/maven2/</url>
-				</pluginRepository>
-				<pluginRepository>
-						<snapshots>
-								<enabled>false</enabled>
-						</snapshots>
-						<id>jcenter-releases-for-plugins</id>
-						<name>jcenter</name>
-						<url>http://jcenter.bintray.com</url>
-				</pluginRepository>
-		</pluginRepositories>
+
 		<build>
 				<finalName>clamp</finalName>
 
@@ -691,6 +714,13 @@
 							<groupId>de.jpdigital</groupId>
 							<artifactId>hibernate52-ddl-maven-plugin</artifactId>
 							<version>2.2.0</version>
+							<dependencies>
+								<dependency>
+									<groupId>javax.xml.bind</groupId>
+									<artifactId>jaxb-api</artifactId>
+									<version>2.3.0</version>
+								</dependency>
+							</dependencies>
 							<executions>
 								<execution>
 									<phase>process-classes</phase>
@@ -707,7 +737,7 @@
 									</configuration>
 								</execution>
 							</executions>
-					
+
 						</plugin>
 						<!-- Read the swagger.json file and the definition from SwaggerConfig.java;
 							generate a list of .adoc files containing the APIs info in more structured
@@ -750,18 +780,13 @@
 						<plugin>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.6</version>
+								<version>1.5.7.1</version>
 								<dependencies>
 										<dependency>
 												<groupId>org.asciidoctor</groupId>
 												<artifactId>asciidoctorj-pdf</artifactId>
 												<version>1.5.0-alpha.10.1</version>
 										</dependency>
-										<dependency>
-												<groupId>org.jruby</groupId>
-												<artifactId>jruby-complete</artifactId>
-												<version>1.7.21</version>
-										</dependency>
 								</dependencies>
 								<configuration>
 										<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>