Upgrade docker images to use Python 3

[sdc.git] / catalog-be / pom.xml

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 39019cd..49fd3df 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.12.1-SNAPSHOT</version>
+        <version>1.12.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -116,6 +116,10 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-http</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -378,13 +382,6 @@
         </dependency>
         <!-- http client END -->
 
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
@@ -733,6 +730,10 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -813,6 +814,10 @@
                     <groupId>javax.jms</groupId>
                     <artifactId>jms</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -834,6 +839,10 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -1258,8 +1267,8 @@
                         </goals>
                         <configuration>
                             <contextId>sdce-2-sdce-5</contextId>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <outputFileName>swagger-sdce-2-sdce-5</outputFileName>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-2-sdce-5</outputFileName>
                             <outputFormat>JSONANDYAML</outputFormat>
                             <configurationFilePath>
                                 ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
@@ -1275,8 +1284,8 @@
                         </goals>
                         <configuration>
                             <contextId>sdce-4</contextId>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <outputFileName>swagger-sdce-4</outputFileName>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-4</outputFileName>
                             <outputFormat>JSONANDYAML</outputFormat>
                             <configurationFilePath>
                                 ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
@@ -1292,8 +1301,8 @@
                         </goals>
                         <configuration>
                             <contextId>sdce-6</contextId>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <outputFileName>swagger-sdce-6</outputFileName>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-6</outputFileName>
                             <outputFormat>JSONANDYAML</outputFormat>
                             <configurationFilePath>
                                 ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
@@ -1309,8 +1318,8 @@
                         </goals>
                         <configuration>
                             <contextId>sdce-7</contextId>
-                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
-                            <outputFileName>swagger-sdce-7</outputFileName>
+                            <outputPath>${project.build.directory}/generated/openapi</outputPath>
+                            <outputFileName>openapi-sdce-7</outputFileName>
                             <outputFormat>JSONANDYAML</outputFormat>
                             <configurationFilePath>
                                 ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml