Merge "Hibernate db fix"

[portal.git] / ecomp-portal-BE-common / pom.xml

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index fb16be0..66adc61 100644 (file)
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>2.3.0</version>
+               <version>2.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>portal-be-common</artifactId>
@@ -86,7 +86,7 @@
                        </plugin>
 
                </plugins>
-
+       
                <testResources>
                        <testResource>
                                <directory>src/test/java</directory>
@@ -117,6 +117,22 @@
        </build>
 
        <dependencies>
+       <dependency>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>aaf-cadi-aaf</artifactId>
+               <version>2.1.7</version>
+               <exclusions>
+                       <exclusion>
+                               <groupId>gso</groupId>
+                               <artifactId>GLCookieDecryption</artifactId>
+                       </exclusion>
+               </exclusions>
+       </dependency>
+       <dependency>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>aaf-cadi-core</artifactId>
+               <version>2.1.7</version>
+       </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
                        <artifactId>eelf-core</artifactId>
@@ -163,6 +179,11 @@
                        <artifactId>spring-test</artifactId>
                        <version>${springframework.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>jaxb-api</artifactId>
+                       <version>2.4.0-b180830.0359</version>
+               </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter</artifactId>
@@ -584,6 +605,24 @@
                        <artifactId>jackson-jaxrs-json-provider</artifactId>
                        <version>2.8.10</version>
                </dependency>
+               <!-- https://mvnrepository.com/artifact/org.glassfish.web/javax.el -->
+               <dependency>
+                       <groupId>org.glassfish.web</groupId>
+                       <artifactId>javax.el</artifactId>
+                       <version>2.2.6</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/javax.el/el-api -->
+               <dependency>
+                       <groupId>javax.el</groupId>
+                       <artifactId>el-api</artifactId>
+                       <version>2.2.1-b04</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
+               <dependency>
+                       <groupId>org.jsoup</groupId>
+                       <artifactId>jsoup</artifactId>
+                       <version>1.12.1</version>
+               </dependency>
                <dependency>
                        <groupId>org.glassfish.jersey.connectors</groupId>
                        <artifactId>jersey-jetty-connector</artifactId>
@@ -618,17 +657,17 @@
         <dependency>
                    <groupId>org.springframework.security</groupId>
                    <artifactId>spring-security-core</artifactId>
-                   <version>${springframework.version}</version>
+                   <version>${springframework.security.version}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.security</groupId>
                <artifactId>spring-security-web</artifactId>
-               <version>${springframework.version}</version>
+               <version>${springframework.security.version}</version>
         </dependency>
            <dependency>
                    <groupId>org.springframework.security</groupId>
                    <artifactId>spring-security-config</artifactId>
-                   <version>${springframework.version}</version>
+                   <version>${springframework.security.version}</version>
            </dependency>
                <dependency>
                <groupId>com.thoughtworks.xstream</groupId>
@@ -659,7 +698,7 @@
            <dependency>
                    <groupId>org.onap.music</groupId>
                    <artifactId>MUSIC</artifactId>
-                   <version>2.5.5</version>
+                   <version>2.5.10-SNAPSHOT</version>
                    <exclusions> 
                                <exclusion> 
                                          <groupId>com.sun.jersey</groupId> 
@@ -704,6 +743,17 @@
        
                        
                </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>1.18.4</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>com.alibaba</groupId>
+                       <artifactId>fastjson</artifactId>
+                       <version>1.2.7</version>
+               </dependency>
        </dependencies>
 
 </project>