Update shiro logging and sl4j init

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

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 9e9410b..1a63ea5 100644 (file)
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -1,25 +1,22 @@
 <?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>
@@ -27,22 +24,15 @@
        <parent>
                <groupId>org.onap.aaf.cadi.sidecar</groupId>
                <artifactId>sidecar</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>2.1.11-SNAPSHOT</version>
        </parent>
 
        <artifactId>fproxy</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
-       <name>aaf-fproxy</name>
+       <name>Sidecar 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>
-       </properties>
-
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -57,18 +47,28 @@
        </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>
-                                       <artifactId>spring-boot-starter-tomcat</artifactId>
                                        <groupId>org.springframework.boot</groupId>
+                                       <artifactId>spring-boot-starter-tomcat</artifactId>
                                </exclusion>
                                <exclusion>
                                        <groupId>org.springframework.boot</groupId>
@@ -78,27 +78,14 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
                </dependency>
 
                <dependency>
                        <groupId>com.google.code.gson</groupId>
                        <artifactId>gson</artifactId>
                </dependency>
-
-               <!-- Testing -->
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
        </dependencies>
 
        <build>