diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-11-07 20:52:15 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-11-07 20:52:27 -0600 |
| commit | 5aa8aec689a399e7803e84e531532d0c61631ec1 (patch) | |
| tree | a5297d6d21b940b9411609331973909e1f6869e4 /sidecar/fproxy/pom.xml | |
| parent | e9c0bf259db0084592536e896cc449b5cf34b84f (diff) | |
Fix/Renable sidecar builds
Issue-ID: AAF-613
Change-Id: Ic13411eebbf3c1c9b6d8492aff1b37db37a965e4
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'sidecar/fproxy/pom.xml')
| -rw-r--r-- | sidecar/fproxy/pom.xml | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml index 0246eb2..e79bd3e 100644 --- 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> |