Fix/Renable sidecar builds

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

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 0246eb2..e79bd3e 100644 (file)
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -33,68 +33,40 @@
        <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>
-                               <!-- Import dependency management from Spring Boot -->
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-dependencies</artifactId>
-                               <version>${spring.boot.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <dependencies>
                <dependency>
+                       <!-- Import dependency management from Spring Boot -->
                        <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-jetty</artifactId>
+                       <artifactId>spring-boot-dependencies</artifactId>
+                       <version>${spring.boot.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
                </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>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework.boot</groupId>
-                                       <artifactId>spring-boot-starter-json</artifactId>
-                               </exclusion>
-                       </exclusions>
+                   <groupId>org.apache.httpcomponents</groupId>
+                   <artifactId>httpclient</artifactId>
                </dependency>
-
+               
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-jetty</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-aop</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-web</artifactId>
                </dependency>
 
-               <!-- Testing -->
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
                </dependency>
-
        </dependencies>
 
        <build>