X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fpom.xml;h=860fae10d9d5aa22fc26165d0e908aa515beb556;hb=98f822c2687fc05c6087796f89baacf76f3b370b;hp=6ac7978075dd5dbaface45dacf4d2df22e2a7b01;hpb=766e6af8d8ddf946ad5cb45a560b040e4857065e;p=nonrtric.git

diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 6ac79780..860fae10 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -52,8 +52,8 @@
         <sdk.version>1.1.6</sdk.version>
         <swagger.version>2.0.0</swagger.version>
         <json.version>20180130</json.version>
+        <awaitility.version>4.0.1</awaitility.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
         <formatter-maven-plugin.version>2.8.1</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
         <docker-maven-plugin>0.30.0</docker-maven-plugin>
@@ -90,6 +90,10 @@
             <artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
             <version>${swagger.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -134,6 +138,12 @@
             <version>${springfox.version}</version>
         </dependency>
         <!-- TEST -->
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -193,13 +203,9 @@
                 <configuration>
                     <skipTests>false</skipTests>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                         <groupId>org.junit.platform</groupId>
-                         <artifactId>junit-platform-surefire-provider</artifactId>
-                         <version> ${junit-platform-surefire-provider.version}</version>
-                     </dependency>
-                 </dependencies>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -225,6 +231,32 @@
                 <version>${docker-maven-plugin}</version>
                 <inherited>false</inherited>
                 <executions>
+                    <execution>
+                        <id>generate-policy-agent-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
+                            <images>
+                                <image>
+                                    <name>o-ran-sc/nonrtric-policy-agent:${project.version}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <contextDir>${basedir}</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <JAR>${project.build.finalName}.jar</JAR>
+                                        </args>
+                                        <tags>
+                                            <tag>${project.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>push-policy-agent-image</id>
                         <goals>
@@ -236,10 +268,13 @@
                             <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                             <images>
                                 <image>
-                                    <name>o-ran-sc/policy-agent:${project.version}</name>
+                                    <name>o-ran-sc/nonrtric-policy-agent:${project.version}</name>
                                     <build>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <JAR>${project.build.finalName}.jar</JAR>
+                                        </args>
                                         <tags>
                                             <tag>${project.version}</tag>
                                         </tags>