From: Henrik Andersson <henrik.b.andersson@est.tech>
Date: Thu, 19 Dec 2019 15:23:42 +0000 (+0000)
Subject: Merge "Make StartupService use asynchronous client"
X-Git-Tag: 1.0.1~63
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=inline;h=023c1b75327ff105348f9dc8eedc0cbf45e7a419;hp=-c;p=nonrtric.git

Merge "Make StartupService use asynchronous client"
---

023c1b75327ff105348f9dc8eedc0cbf45e7a419
diff --combined policy-agent/pom.xml
index 6ac79780,551a95bf..ef5dc139
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@@ -52,11 -52,11 +52,11 @@@
          <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>
 -        <dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
 +        <docker-maven-plugin>0.30.0</docker-maven-plugin>
      </properties>
      <dependencies>
          <dependency>
@@@ -134,6 -134,12 +134,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 -199,9 +199,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>
@@@ -220,35 -222,16 +222,35 @@@
                  </executions>
              </plugin>
              <plugin>
 -                <groupId>com.spotify</groupId>
 -                <artifactId>dockerfile-maven-plugin</artifactId>
 -                <version>${dockerfile-maven-plugin.version}</version>
 -                <configuration>
 -                    <repository>oransc/policy-agent</repository>
 -                    <tag>${project.version}</tag>
 -                    <buildArgs>
 -                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 -                    </buildArgs>
 -                </configuration>
 +                <groupId>io.fabric8</groupId>
 +                <artifactId>docker-maven-plugin</artifactId>
 +                <version>${docker-maven-plugin}</version>
 +                <inherited>false</inherited>
 +                <executions>
 +                    <execution>
 +                        <id>push-policy-agent-image</id>
 +                        <goals>
 +                            <goal>build</goal>
 +                            <goal>push</goal>
 +                        </goals>
 +                        <configuration>
 +                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
 +                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
 +                            <images>
 +                                <image>
 +                                    <name>o-ran-sc/policy-agent:${project.version}</name>
 +                                    <build>
 +                                        <contextDir>${basedir}</contextDir>
 +                                        <dockerFile>Dockerfile</dockerFile>
 +                                        <tags>
 +                                            <tag>${project.version}</tag>
 +                                        </tags>
 +                                    </build>
 +                                </image>
 +                            </images>
 +                        </configuration>
 +                    </execution>
 +                </executions>
              </plugin>
          </plugins>
      </build>