From: Sébastien Determe <sd378r@intl.att.com>
Date: Tue, 3 Jul 2018 08:36:38 +0000 (+0000)
Subject: Merge "cleaned up clds service code"
X-Git-Tag: 3.0.0~59
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=628985aac4fbe481e20acb1a5578fe41749ea5ae;hp=-c;p=clamp.git

Merge "cleaned up clds service code"
---

628985aac4fbe481e20acb1a5578fe41749ea5ae
diff --combined pom.xml
index 9821f3d2,bc863d4f..7c540867
--- a/pom.xml
+++ b/pom.xml
@@@ -71,7 -71,7 +71,7 @@@
  				<guava.version>20.0</guava.version>
  				<eelf.core.version>1.0.0</eelf.core.version>
  				<camel.version>2.20.1</camel.version>
 -				<springboot.version>1.5.12.RELEASE</springboot.version>
 +				<springboot.version>1.5.14.RELEASE</springboot.version>
  
  				<sonar.language>java</sonar.language>
  				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@@ -82,7 -82,6 +82,7 @@@
  				<sonar.projectVersion>${project.version}</sonar.projectVersion>
  
  				<docker.push.registry>localhost:5000</docker.push.registry>
 +				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
  				<docker.skip.build>true</docker.skip.build>
  				<docker.skip.push>true</docker.skip.push>
  				<docker.skip.tag>true</docker.skip.tag>
@@@ -91,54 -90,6 +91,54 @@@
  				<tomcat.version>8.5.28</tomcat.version>
  		</properties>
  
 +		<profiles>
 +				<profile>
 +						<id>without-test</id>
 +						<activation>
 +							<property>
 +								<name>maven.test.skip</name>
 +								<value>true</value>
 +							</property>
 +						</activation>
 +						<properties>
 +							<docker.skip.run>true</docker.skip.run>
 +						</properties>
 +				</profile>
 +				<profile>
 +						<id>without-IT-only</id>
 +						<activation>
 +							<property>
 +								<name>skipITs</name>
 +								<value>true</value>
 +							</property>
 +						</activation>
 +						<properties>
 +							<docker.skip.run>true</docker.skip.run>
 +						</properties>
 +				</profile>
 +				<profile>
 +						<id>without-IT-only2</id>
 +						<activation>
 +							<property>
 +								<name>skipTests</name>
 +								<value>true</value>
 +							</property>
 +						</activation>
 +						<properties>
 +							<docker.skip.run>true</docker.skip.run>
 +						</properties>
 +				</profile>
 +				<profile>
 +						<id>docker</id>
 +						<properties>
 +								<skip.staging.artifacts>true</skip.staging.artifacts>
 +								<docker.skip.build>false</docker.skip.build>
 +								<docker.skip.tag>false</docker.skip.tag>
 +								<docker.skip.push>false</docker.skip.push>
 +						</properties>
 +				</profile>
 +		</profiles>
 +
  		<distributionManagement>
  				<repository>
  						<id>ecomp-releases</id>
@@@ -413,7 -364,7 +413,7 @@@
  										<artifactId>commons-io</artifactId>
  								</exclusion>
  								<exclusion>
 -										<artifactId>grizzly-http</artifactId>
 +										<artifactId>grizzly-http-server</artifactId>
  										<groupId>org.glassfish.grizzly</groupId>
  								</exclusion>
  						</exclusions>
@@@ -466,10 -417,6 +466,10 @@@
  										<groupId>com.att.nsa</groupId>
  										<artifactId>dmaapClient</artifactId>
  								</exclusion>
 +								<exclusion>
 +										<groupId>com.h2database</groupId>
 +										<artifactId>h2</artifactId>
 +								</exclusion>
  						</exclusions>
  				</dependency>
  				<dependency>
@@@ -596,6 -543,13 +596,13 @@@
  						<version>1.2.0</version>
  						<scope>test</scope>
  				</dependency>
+ 				<!-- TESTING -->
+ 				<dependency>
+ 						<groupId>org.assertj</groupId>
+ 						<artifactId>assertj-core</artifactId>
+ 						<version>3.10.0</version>
+ 						<scope>test</scope>
+ 				</dependency>
  		</dependencies>
  		<pluginRepositories>
  				<pluginRepository>
@@@ -651,7 -605,7 +658,7 @@@
  				</resources>
  
  				<plugins>
- 						<!-- Scan Clamp code and generate the swagger.json file with all the 
+ 						<!-- Scan Clamp code and generate the swagger.json file with all the
  								APIs -->
  						<plugin>
  								<groupId>com.sebastian-daschner</groupId>
@@@ -671,8 -625,8 +678,8 @@@
  								</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 
+ 						<!-- Read the swagger.json file and the definition from SwaggerConfig.java;
+ 								generate a list of .adoc files containing the APIs info in more structured
  								way -->
  						<plugin>
  								<groupId>io.github.swagger2markup</groupId>
@@@ -707,7 -661,7 +714,7 @@@
  								</executions>
  						</plugin>
  
- 						<!-- Run the generated asciidoc through Asciidoctor to generate other 
+ 						<!-- Run the generated asciidoc through Asciidoctor to generate other
  								documentation types, such as PDFs or HTML5 -->
  						<plugin>
  								<groupId>org.asciidoctor</groupId>
@@@ -828,9 -782,7 +835,9 @@@
  						<plugin>
  								<groupId>org.springframework.boot</groupId>
  								<artifactId>spring-boot-maven-plugin</artifactId>
 -								<version>${springboot.version}</version>
 +								<!-- Temporary fix -->
 +								<version>1.5.13.RELEASE</version>
 +								<!-- <version>${springboot.version}</version> -->
  								<executions>
  										<execution>
  												<goals>
@@@ -866,7 -818,7 +873,7 @@@
  						<plugin>
  								<groupId>org.apache.maven.plugins</groupId>
  								<artifactId>maven-failsafe-plugin</artifactId>
 -								<version>2.16</version>
 +								<version>2.17</version>
  
  								<executions>
  										<execution>
@@@ -894,7 -846,7 +901,7 @@@
  										<apiVersion>1.23</apiVersion>
  										<images>
  												<image>
 -														<name>mariadb:10.1.11</name>
 +														<name>library/mariadb:10.1.11</name>
  														<alias>mariadb</alias>
  														<run>
  																<env>
@@@ -917,7 -869,7 +924,7 @@@
  														</run>
  												</image>
  												<image>
 -														<name>python:2-slim</name>
 +														<name>library/python:2-slim</name>
  														<alias>python</alias>
  														<run>
  																<hostname>python</hostname>
@@@ -955,8 -907,7 +962,8 @@@
  																		<tag>${project.docker.latesttagtimestamp.version}</tag>
  																		<tag>${project.docker.latesttag.version}</tag>
  																</tags>
 -																<!-- A relative path is looked up in ${project.basedir}/src/main/docker by default -->
 +																<!-- A relative path is looked up in ${project.basedir}/src/main/docker 
 +																		by default -->
  																<dockerFile>Dockerfile</dockerFile>
  																<assembly>
  																		<descriptor>assembly/clamp-files.xml</descriptor>
@@@ -965,6 -916,7 +972,6 @@@
  														</build>
  												</image>
  										</images>
 -										<skip>${skipITs}</skip>
  								</configuration>
  								<executions>
  										<execution>
@@@ -987,6 -939,9 +994,6 @@@
  												<goals>
  														<goal>start</goal>
  												</goals>
 -												<configuration>
 -														<skip>${skipITs}</skip>
 -												</configuration>
  										</execution>
  										<execution>
  												<id>docker-stop-for-it</id>
@@@ -994,6 -949,9 +1001,6 @@@
  												<goals>
  														<goal>stop</goal>
  												</goals>
 -												<configuration>
 -														<skip>${skipITs}</skip>
 -												</configuration>
  										</execution>
  								</executions>
  						</plugin>
@@@ -1058,4 -1016,15 +1065,4 @@@
  						</plugin>
  				</plugins>
  		</build>
 -		<profiles>
 -				<profile>
 -						<id>docker</id>
 -						<properties>
 -								<skip.staging.artifacts>true</skip.staging.artifacts>
 -								<docker.skip.build>false</docker.skip.build>
 -								<docker.skip.tag>false</docker.skip.tag>
 -								<docker.skip.push>false</docker.skip.push>
 -						</properties>
 -				</profile>
 -		</profiles>
  </project>