Code Review / policy / engine.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes
[policy/engine.git] / ECOMP-PDP-REST / pom.xml
diff --git a/ECOMP-PDP-REST/pom.xml b/ECOMP-PDP-REST/pom.xml
index b029df2..142d81b 100644 (file)
--- a/ECOMP-PDP-REST/pom.xml
+++ b/ECOMP-PDP-REST/pom.xml
@@ -18,58 +18,41 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-
-<!-- Apache Maven 2 POM generated by Apache Ivy http://ant.apache.org/ivy/ 
-       Apache Ivy version: 2.0.0-beta1 20071206070608 -->
 <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/maven-v4_0_0.xsd">
 
        <modelVersion>4.0.0</modelVersion>
-       
+
        <parent>
                <groupId>org.openecomp.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
-       
-       <groupId>org.openecomp.policy.engine</groupId>
+
        <artifactId>ECOMP-PDP-REST</artifactId>
-       
+
        <description>ECOMP PDP REST</description>
-       
+       <properties>
+               <springframework.version>4.3.3.RELEASE</springframework.version>
+       </properties>
        <packaging>war</packaging>
        <build>
                <plugins>
-                       <plugin>
-                       <artifactId>maven-war-plugin</artifactId>
-                       <version>2.1</version>
-                       <configuration>
-                               <attachClasses>true</attachClasses>
-                       </configuration>
-                       </plugin>
-       </plugins>
+                       <plugin>
+                               <artifactId>maven-war-plugin</artifactId>
+                               <version>2.1</version>
+                               <configuration>
+                                       <attachClasses>true</attachClasses>
+                               </configuration>
+                       </plugin>
+               </plugins>
        </build>
        <dependencies>
-               <!-- Not needed because of XACML-PDP dependency <dependency> <groupId>${project.parent.groupId}</groupId> 
-                       <artifactId>XACML</artifactId> <version>${project.parent.version}</version> 
-                       </dependency> <dependency> <groupId>org.openecomp.policy.pdp.rest</groupId> 
-                       <artifactId>XACML-REST</artifactId> <version>${project.parent.version}</version> 
-                       </dependency> -->
                <dependency>
                        <groupId>org.openecomp.policy.engine</groupId>
                        <artifactId>ECOMP-PDP</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.openecomp.policy.common</groupId>
-                       <artifactId>ECOMP-Logging</artifactId>
-                       <version>${common-modules.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-               </dependency>
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
@@ -91,20 +74,10 @@
                        <artifactId>commons-io</artifactId>
                        <version>2.4</version>
                </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>4.3.1</version>
-               </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>14.0.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.3.0-rc1</version>
+                       <version>19.0</version>
                </dependency>
                <dependency>
                        <groupId>mysql</groupId>
@@ -115,12 +88,24 @@
                        <groupId>org.mariadb.jdbc</groupId>
                        <artifactId>mariadb-java-client</artifactId>
                        <version>1.2.3</version>
-               </dependency>           
+               </dependency>
                <dependency>
                        <groupId>postgresql</groupId>
                        <artifactId>postgresql</artifactId>
                        <version>9.1-901.jdbc4</version>
                </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${springframework.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.awaitility</groupId>
+                       <artifactId>awaitility</artifactId>
+                       <version>3.0.0</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.hsqldb</groupId>
                        <artifactId>hsqldb</artifactId>
@@ -136,40 +121,34 @@
                        <artifactId>jersey-core</artifactId>
                        <version>1.18</version>
                </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.12</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>javax.websocket</groupId>
                        <artifactId>javax.websocket-api</artifactId>
                        <version>1.1</version>
                        <scope>provided</scope>
                </dependency>
-               <!-- <dependency>
-                       <groupId>com.att.nsa</groupId>
-                       <artifactId>gfp-2020</artifactId>
-                        <version>1.0.2</version>
-                       <type>pom</type>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>slf4j-log4j12</artifactId>
-                                       <groupId>org.slf4j</groupId>
-                               </exclusion>
-                       </exclusions>
-               </dependency> -->
-               <dependency>
-                       <groupId>com.att.nsa</groupId>
-                       <artifactId>cambriaClient</artifactId>
-                       <version>0.0.1</version>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>slf4j-log4j12</artifactId>
-                                       <groupId>org.slf4j</groupId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-                               <dependency>
+               <dependency>
+                       <groupId>com.att.nsa</groupId>
+                       <artifactId>cambriaClient</artifactId>
+                       <version>0.0.1</version>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>slf4j-log4j12</artifactId>
+                                       <groupId>org.slf4j</groupId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
                        <version>1.9.5</version>
-               </dependency>     
+               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-mock</artifactId>
@@ -180,18 +159,6 @@
                        <artifactId>mockrunner</artifactId>
                        <version>0.3.1</version>
                </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.0.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
@@ -202,5 +169,55 @@
                        <artifactId>powermock-module-junit4</artifactId>
                        <version>1.5.6</version>
                </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.springfox</groupId>
+                       <artifactId>springfox-swagger2</artifactId>
+                       <version>2.5.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-annotations</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>io.springfox</groupId>
+                       <artifactId>springfox-swagger-ui</artifactId>
+                       <version>2.5.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.openecomp.policy.engine</groupId>
+                       <artifactId>PolicyEngineAPI</artifactId>
+                       <version>${project.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.glassfish.tyrus</groupId>
+                                       <artifactId>tyrus-client</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.glassfish.tyrus</groupId>
+                                       <artifactId>tyrus-container-grizzly-client</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>javax.persistence</groupId>
+                                       <artifactId>persistence-api</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file
-- Archived 06/09/2021