diff options
| author |   Jonathan Gathman <jonathan.gathman@att.com> | 2018-11-12 13:09:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-12 13:09:41 +0000 |
| commit | f2c2c058cf0660c94ad0a40445c6305b0be2de14 (patch) | |
| tree | bb9ffbfd0a17c15c50207194dc7805b5400f574b /sidecar/fproxy/pom.xml | |
| parent | 2712fbc1e6a5638a8ac49017123bc32e1d1431e9 (diff) | |
| parent | d3e1728b11f11d3979f04be1773e338416090d77 (diff) | |
Merge "Update FProxy to separate truststore and keystore"
Diffstat (limited to 'sidecar/fproxy/pom.xml')
| -rw-r--r-- | sidecar/fproxy/pom.xml | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml index e79bd3e..68e6a86 100644 --- a/sidecar/fproxy/pom.xml +++ b/sidecar/fproxy/pom.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--* ============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==================================================== +<!--* ============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"> @@ -33,21 +33,25 @@ <name>Sidecar fproxy</name> <description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description> + <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-dependencies</artifactId> - <version>${spring.boot.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> |