X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=36f333c82cf01a7bb26313e503edc32db215e6c6;hb=9b9124d146f1de836c9644548f6ec0516740cae3;hp=44003e7ef7b8ce74f211952f0030f79cda53b12a;hpb=5c2e47c7d7648dfdc35436b4f2730475945709bd;p=sdc%2Fsdc-tosca.git

diff --git a/pom.xml b/pom.xml
index 44003e7..36f333c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,16 @@
 	<artifactId>sdc-tosca</artifactId>
 	<name>sdc-sdc-tosca</name>
 	<description>SDC Tosca Parser JAR file for use by consumers</description>
-	<version>1.3.5-SNAPSHOT</version>
+	<version>1.6.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>2.0.0</version>
+		<relativePath/>
+	</parent>
+
 	<properties>
 
 		<!-- ==================== -->
@@ -30,7 +37,6 @@
 		<sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
 		<snapshots.path>snapshots</snapshots.path>
 		<releases.path>releases</releases.path>
-		<staging.profile.id>176c31dfe190a</staging.profile.id>
 		<!-- Sonar properties -->
 		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
 		<sonar.skipDesign>true</sonar.skipDesign>
@@ -44,13 +50,19 @@
 	</properties>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
 			<scope>compile</scope>
+			<version>1.7.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+			<version>1.7.10</version>
 		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -72,13 +84,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<!-- YAML parser -->
 		<dependency>
 			<groupId>org.yaml</groupId>
@@ -105,14 +110,14 @@
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
-		    <version>2.9.4</version>
+		    <version>2.9.9</version>
 		</dependency>
 
 		<!-- jtosca Tosca Parser -->
 		<dependency>
 			<groupId>org.onap.sdc.jtosca</groupId>
 			<artifactId>jtosca</artifactId>
-			<version>1.3.5</version>
+			<version>1.6.0</version>
 		</dependency>
 
 
@@ -121,13 +126,13 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
 			<scope>test</scope>
-			<version>9.2.10.v20150310</version>
+			<version>9.4.18.v20190429</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
-			<version>9.2.10.v20150310</version>
+			<version>9.4.18.v20190429</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -145,8 +150,14 @@
 			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 	
 	<reporting>
 		<plugins>
@@ -184,6 +195,15 @@
 				</dependencies>
 			</plugin>
 
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<configuration>
+					<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+					<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -202,19 +222,6 @@
 				</executions>
 			</plugin>
 
-			<!-- Staging Plugin -->
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${nexus.proxy}</nexusUrl>
-					<stagingProfileId>${staging.profile.id}</stagingProfileId>
-					<serverId>onap-staging</serverId>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -237,6 +244,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.19.1</version>
 				<configuration>
+					<argLine>${argLine} -Xmx2048m</argLine>
 					<includes>
 						<include>**/ToscaParser***Test.class</include>
 					</includes>
@@ -248,6 +256,37 @@
 				<artifactId>sonar-maven-plugin</artifactId>
 				<version>3.0.2</version>
 			</plugin>
+
+			<plugin>
+				<groupId>com.github.sylvainlaurent.maven</groupId>
+				<artifactId>yaml-json-validator-maven-plugin</artifactId>
+				<version>1.0.1</version>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>validate</goal>
+						</goals>
+						<configuration>
+							<validationSets>
+								<validationSet>
+									<includes>
+										<include>src/main/resources/**/*.y*ml</include>
+										<include>src/test/resources/**/*.y*ml</include>
+									</includes>
+								</validationSet>
+								<validationSet>
+									<includes>
+										<include>src/main/resources/**/*.json</include>
+										<include>src/test/resources/**/*.json</include>
+									</includes>
+								</validationSet>
+							</validationSets>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -258,12 +297,12 @@
 			<url>http://repo2.maven.org/maven2/</url>
 		</repository>
 		<repository>
-			<id>onap-releases</id>
+			<id>ecomp-releases</id>
 			<name>Release Repository</name>
 			<url>${nexus.proxy}/content/repositories/releases/</url>
 		</repository>
 		<repository>
-			<id>onap-snapshots</id>
+			<id>ecomp-snapshots</id>
 			<name>Snapshots Repository</name>
 			<url>${nexus.proxy}/content/repositories/snapshots/</url>
 		</repository>
@@ -271,17 +310,17 @@
 
 	<distributionManagement>
 		<repository>
-			<id>onap-releases</id>
+			<id>ecomp-releases</id>
 			<name>Release Repository</name>
 			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>
 		</repository>
 		<snapshotRepository>
-			<id>onap-snapshots</id>
+			<id>ecomp-snapshots</id>
 			<name>Snapshot Repository</name>
 			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
 		</snapshotRepository>
 		<site>
-			<id>onap-site</id>
+			<id>ecomp-site</id>
 			<url>dav:${nexus.proxy}${sitePath}</url>
 		</site>
 	</distributionManagement>