X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=9a8e844bd5452ae282cd87527529e534092b7e81;hb=f96d68dfcdd7d15b0ea04603bcf754bde8875036;hp=2b2f8bbf881b883c97a807365e18914e62a85700;hpb=929374488fa036b9c60c0ab5e9e9f83ccf931955;p=sdc%2Fsdc-tosca.git

diff --git a/pom.xml b/pom.xml
index 2b2f8bb..9a8e844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,225 +1,266 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.openecomp.sdc.jtosca</groupId>
-	<artifactId>jtosca</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-        <name>sdc-jtosca</name>
-	<properties>
-
-		<!-- ==================== -->
-		<!-- Generic properties -->
-		<!-- ==================== -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- ==================== -->
-		<!-- Versions -->
-		<!-- ==================== -->
-		<!-- Global project version -->
-
-		<!-- Dependencies projects version -->
-		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
-		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
-		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
-		<sitePath>/content/sites/site/org/openecomp/sdc/jtosca/${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>
-		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-		<sonar.sources>.</sonar.sources>
-		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
-		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
-		<sonar.branch>${project.version}</sonar.branch>
-
-	</properties>
-
-	<dependencies>
-		<!-- YAML parser -->
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-
-		<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> 
-			<version>1.1.2</version> <scope>test</scope> </dependency> -->
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-		</dependency>
-		
-		<dependency>
-		  <groupId>com.opencsv</groupId>
-		  <artifactId>opencsv</artifactId>
-		  <version>3.10</version>
-		  <scope>test</scope>
-		</dependency>
-		
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io -->
-<dependency>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-io</artifactId>
-    <version>1.3.2</version>
-</dependency>
-
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
-		</dependency>
-		
-	</dependencies>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.4</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-webdav-jackrabbit</artifactId>
-						<version>2.10</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.8</version>
-				<executions>
-					<!-- Unit-Tests -->
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.onap.sdc.sdc-tosca</groupId>
+  <artifactId>sdc-tosca-jtosca</artifactId>
+  <name>sdc-tosca-jtosca</name>
+  <description>SDC Tosca Parser JAR file for use by consumers</description>
+  <version>1.6.5-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>2.0.0</version>
+    <relativePath/>
+  </parent>
+
+  <modules>
+    <module>sdc-tosca</module>
+    <module>jtosca</module>
+  </modules>
+
+  <properties>
+
+    <!-- ==================== -->
+    <!-- Generic properties -->
+    <!-- ==================== -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <!-- ==================== -->
+    <!-- Versions -->
+    <hamcrest.version>2.1</hamcrest.version>
+    <!-- ==================== -->
+    <!-- Global project version -->
+
+    <!-- Dependencies projects version -->
+    <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+    <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
+    <snapshots.path>snapshots</snapshots.path>
+    <releases.path>releases</releases.path>
+	
+    <!-- Sonar properties -->
+	<sonar.language>java</sonar.language>
+	<sonar.coverage.jacoco.xmlReportPaths>
+		${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+	</sonar.coverage.jacoco.xmlReportPaths>
+    <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+    <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+    <sonar.sources>.</sonar.sources>
+    <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
+    <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+    <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>compile</scope>
+      <version>25.1-jre</version>
+    </dependency>
+
+    <!-- YAML parser -->
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.14</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.13.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>org.umlgraph</groupId>
+            <artifactId>umlgraph</artifactId>
+            <version>5.6</version>
+          </docletArtifact>
+          <additionalparam>-views</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+          </dependency>
+        </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>
+        <version>0.7.8</version>
+        <executions>
+          <!-- Unit-Tests -->
+          <execution>
+            <id>prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
-						</configuration>
-					</execution>
-				</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>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
-				<configuration />
-			</plugin>
-			<!-- Test -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<includes>
-						<include>*/*</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonarsource.scanner.maven</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.0.2</version>
-			</plugin>
-		</plugins>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>Official Maven repository</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>onap-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>onap-snapshots</id>
-			<name>Snapshots Repository</name>
-			<url>${nexus.proxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>onap-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>
-		</repository>
-		<snapshotRepository>
-			<id>onap-snapshots</id>
-			<name>Snapshot Repository</name>
-			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
-		</snapshotRepository>
-		<site>
-			<id>onap-site</id>
-			<url>dav:${nexus.proxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
+        <configuration/>
+      </plugin>
+      <!-- Test -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <argLine>${argLine} -Xmx2048m</argLine>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>3.7.0.1746</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>
+
+  <repositories>
+    <repository>
+      <id>central</id>
+      <name>Official Maven repository</name>
+      <url>http://repo2.maven.org/maven2/</url>
+    </repository>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshots Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
 
+  <distributionManagement>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/${releases.path}/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshot Repository</name>
+      <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
+    </snapshotRepository>
+    <site>
+      <id>ecomp-site</id>
+      <url>dav:${nexus.proxy}${sitePath}</url>
+    </site>
+  </distributionManagement>
 </project>