X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-schema-service%2Fpom.xml;h=f78c1ac6335b73094e84a6c6d9f800f8e9f386a4;hb=5b2d60d7547cf77ae2464e54562ff6660d08a496;hp=e101f3148d6c4c54df2d7cdc4045e5cde86a8fe2;hpb=bb11c3aad1fe6d206da25e7c4ba1be16931e8b46;p=aai%2Fschema-service.git

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index e101f31..f78c1ac 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.9.5-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>
@@ -42,6 +42,8 @@
         <docker.push.registry>localhost:5000</docker.push.registry>
         <aai.docker.version>1.0.0</aai.docker.version>
 
+        <logback.version>1.2.7</logback.version>
+
         <!--
              Location where assembly of our scripts, resources and main jar will be held
 	         Check the ${project.artifactId}/src/main/assembly/descriptor.xml for more info
@@ -50,7 +52,7 @@
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
         <aai.base.image>alpine</aai.base.image>
-        <aai.base.image.version>1.6.0</aai.base.image.version>
+        <aai.base.image.version>1.8.1</aai.base.image.version>
 
         <maven.skip.tests>true</maven.skip.tests>
 
@@ -72,8 +74,8 @@
         <schema.version.app.root.start>v11</schema.version.app.root.start>
         <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
         <schema.version.edge.label.start>v12</schema.version.edge.label.start>
-        <schema.version.api.default>v22</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22</schema.version.list>
+        <schema.version.api.default>v26</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26</schema.version.list>
         <schema.uri.base.path>/aai/schema-service</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
 
@@ -161,7 +163,7 @@
                             </execution>
                             <execution>
                                 <id>generate-images</id>
-                                <phase>package</phase>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
@@ -184,7 +186,7 @@
             <properties>
                 <schema.source.name>onap</schema.source.name>
                 <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,18,v19,v20,v21,v22</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,18,v19,v20,v21,v22,v23,v24,v25,v26</schema.version.list>
             </properties>
         </profile>
         <!-- End of ONAP Profile -->
@@ -269,6 +271,11 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
@@ -309,6 +316,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -339,14 +347,17 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.moxy</artifactId>
+            <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -626,6 +637,45 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-fat-jar</id>
+                        <!--
+                          Reason the phase for this is set in the post integration phase due
+                          to the spring boot maven plugin repackages post package phase
+
+                          So basically first the spring boot plugin in phase package or pre package
+                          only creates an jar without its dependencies
+
+                          ls -trl target/
+
+                          3.3 MB  aai-schema-1.8.0-SNAPSHOT.jar
+
+                          Then in the post package or during the package phase, it would get dependencies
+                          and convert it into an fat jar
+
+                          80 MB  aai-schema-1.8.0-SNAPSHOT.jar
+
+                          During the package phase if the copy of the above aai-schema-1.8.0-SNAPSHOT jar
+                          was done, it would take the slim 3.3 MB jar and wouldn't include any of the dependencies
+                          so thats why the phase for this exection must be in post the spring boot repackage phase
+                        -->
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${aai.build.directory}/lib/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/</directory>
+                                    <includes>
+                                        <include>${project.artifactId}-${project.version}.jar</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>