X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fcadi.git;a=blobdiff_plain;f=sidecar%2Ffproxy%2Fpom.xml;h=8875dd8954af46361311202cf75659bbf716f477;hp=8035e846088d2909f51b530cf0338e55daf993ae;hb=refs%2Fheads%2Fmaster;hpb=6c3031ea90d5b51ae44a599c0cd0d95c057cf633

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 8035e84..fce139d 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -1,48 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aaf
-    ================================================================================
-    Copyright © 2018 European Software Marketing Ltd.
-    ================================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ============LICENSE_END=========================================================
-
--->
+<!--* ============LICENSE_START====================================================
+    * ===========================================================================
+    * org.onap.aaf
+    * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+    * ===========================================================================
+    * Licensed under the Apache License, Version 2.0 (the "License");
+    * you may not use this file except in compliance with the License.
+    * You may obtain a copy of the License at
+    *
+    * http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing, software
+    * distributed under the License is distributed on an "AS IS" BASIS,
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    * See the License for the specific language governing permissions and
+    * limitations under the License.
+    * ============LICENSE_END====================================================
+    * -->
 <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>
 
-	<artifactId>fproxy</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
 	<parent>
-		<groupId>org.onap.aaf.cadi</groupId>
+		<groupId>org.onap.aaf.cadi.sidecar</groupId>
 		<artifactId>sidecar</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>2.1.19-SNAPSHOT</version>
 	</parent>
 
-	<name>aaf-fproxy</name>
-	<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
-
 	<properties>
-		<!-- Spring boot version -->
-		<spring.boot.version>2.0.3.RELEASE</spring.boot.version>
-		<docker.location>${basedir}/target</docker.location>
-		<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-	</properties>
+                <fproxy.build.dir>${project.build.directory}/${project.artifactId}-build/</fproxy.build.dir>
+        </properties>
+
+	<artifactId>fproxy</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Sidecar fproxy</name>
+	<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
 
 	<dependencyManagement>
 		<dependencies>
@@ -58,44 +51,45 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jetty</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 			<exclusions>
 				<exclusion>
+					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+				<exclusion>
 					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-json</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
+			<artifactId>spring-boot-starter-test</artifactId>
 		</dependency>
 
-		<!-- Testing -->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
 		</dependency>
-
 	</dependencies>
 
 	<build>
@@ -126,65 +120,83 @@
 				<configuration>
 					<reuseForks>false</reuseForks>
 					<forkCount>1</forkCount>
+					<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
-				<executions>
-					<execution>
-						<id>copy-docker-file</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<overwrite>true</overwrite>
-							<resources>
-								<resource>
-									<directory>${basedir}/src/main/docker</directory>
-									<filtering>true</filtering>
-								</resource>
-								<resource>
-									<directory>${basedir}/src/main/bin/</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.11</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.github.jnr</groupId>
-						<artifactId>jnr-unixsocket</artifactId>
-						<version>0.13</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<verbose>true</verbose>
-					<serverId>docker-hub</serverId>
-					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
-					<dockerDirectory>${docker.location}</dockerDirectory>
-					<imageTags>
-						<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
-				</configuration>
+                		<artifactId>maven-assembly-plugin</artifactId>
+                		<configuration>
+                    			<descriptors>
+                        			<descriptor>src/main/assembly/descriptor.xml</descriptor>
+                    			</descriptors>
+                		</configuration>
+                		<executions>
+                    			<execution>
+                        			<id>make-assembly</id>
+                        			<phase>package</phase>
+                        			<goals>
+                            				<goal>single</goal>
+                        			</goals>
+                    			</execution>
+                		</executions>
+            		</plugin>
+			<!--<plugin>
+                               	<groupId>io.fabric8</groupId>
+                        	<artifactId>docker-maven-plugin</artifactId>
+                        	<version>0.28.0</version>
+                        	<configuration>
+                            		<verbose>true</verbose>
+                            		<apiVersion>${docker.apiVersion}</apiVersion>
+                            		<pullRegistry>${docker.pull.registry}</pullRegistry>
+                            		<pushRegistry>${docker.push.registry}</pushRegistry>
+                           		<serverId>docker-hub</serverId>
+                            		<dockerDirectory>${docker.location}</dockerDirectory>
+                            		<imageTags>
+                                		<imageTag>latest</imageTag>
+                            		</imageTags>
+                            		<forceTags>true</forceTags>
+					<images>
+                                		<image>
+                                    			<name>${docker.push.registry}/onap/${project.artifactId}</name>
+                                    			<build>
+                                        			<cleanup>try</cleanup>
+                                       				<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+                                        			<tags>
+                                            				<tag>latest</tag>
+                                        			</tags>
+                                       				<assembly>
+                                            				<inline>
+                                                				<fileSets>
+                                                    					<fileSet>
+                                                        					<directory>${fproxy.build.dir}</directory>
+                                                        					<outputDirectory>/${project.artifactId}</outputDirectory>
+                                                    					</fileSet>
+                                                				</fileSets>
+                                            				</inline>
+                                        			</assembly>
+                                    			</build>
+                                		</image>
+                            		</images>
+                        	</configuration>
+                         	<executions>
+                             		<execution>
+                                 		<id>generate-images</id>
+						<phase>install</phase>
+					
+                             		</execution>
+                             		<execution>
+                                 		<id>push-images</id>
+                                 		<phase>deploy</phase>
+                                 		<goals>
+                                     			<goal>push</goal>
+                                		</goals>
+                             		</execution>
+                         	</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
+			</plugin> -->
 		</plugins>
 	</build>
 </project>