update license in cadi repo

[aaf/cadi.git] / sidecar / rproxy / pom.xml

diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml
index 530a459..6131a39 100644 (file)
--- a/sidecar/rproxy/pom.xml
+++ b/sidecar/rproxy/pom.xml
@@ -1,37 +1,34 @@
 <?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>
 
        <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.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>rproxy</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>2.1.2-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>aaf-rproxy</name>
@@ -40,7 +37,7 @@
        <properties>
                <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
                <docker.location>${basedir}/target</docker.location>
-               <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+               <!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
        </properties>
 
        <dependencyManagement>
@@ -68,6 +65,10 @@
                                        <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>
 
@@ -86,11 +87,6 @@
                        <artifactId>spring-boot-starter-aop</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-actuator</artifactId>
-               </dependency>
-
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-test</artifactId>
@@ -102,13 +98,12 @@
                <dependency>
                        <groupId>org.onap.aaf.cadi.sidecar</groupId>
                        <artifactId>fproxy</artifactId>
-                       <version>1.0.0-SNAPSHOT</version>
+                       <version>2.1.2-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <groupId>com.google.code.gson</groupId>
                        <artifactId>gson</artifactId>
-                       <version>2.8.5</version><!--$NO-MVN-MAN-VER$-->
                </dependency>
 
                <dependency>
@@ -121,7 +116,7 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>2.1.2-SNAPSHOT</version>
+                       <version>2.1.2</version>
                </dependency>
 
        </dependencies>
@@ -189,13 +184,6 @@
                                <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>