Fix failing jenkins jobs
The docker java daily job is hanging when it tries to build the image.
Add rproxy and tproxy-config as submodules to sidecar. Align the groupid
of sidecar pom.
Change-Id: Idb24459b9eae43dbbef39b4a14b6167762fa126f
Issue-ID: AAI-1676
Signed-off-by: Ravi Geda <gravik@amdocs.com>
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 8035e84..81014e6 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -24,16 +24,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>fproxy</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
<parent>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <artifactId>fproxy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>aaf-fproxy</name>
<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
@@ -160,13 +160,6 @@
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.11</version>
- <dependencies>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-unixsocket</artifactId>
- <version>0.13</version>
- </dependency>
- </dependencies>
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
@@ -181,9 +174,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index d33816c..a4d0435 100644
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -22,7 +22,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>aaf-cadi-sidecar</name>
@@ -46,6 +46,8 @@
<!-- ============================================================== -->
<modules>
<module>fproxy</module>
+ <module>rproxy</module>
+ <module>tproxy-config</module>
</modules>
<build>
diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml
index 530a459..004f569 100644
--- a/sidecar/rproxy/pom.xml
+++ b/sidecar/rproxy/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -189,13 +189,6 @@
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.11</version>
- <dependencies>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-unixsocket</artifactId>
- <version>0.13</version>
- </dependency>
- </dependencies>
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml
index 8ddf186..7aadd30 100644
--- a/sidecar/tproxy-config/pom.xml
+++ b/sidecar/tproxy-config/pom.xml
@@ -25,10 +25,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath />
</parent>
<artifactId>tproxy-config</artifactId>
@@ -104,13 +103,6 @@
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.11</version>
- <dependencies>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-unixsocket</artifactId>
- <version>0.13</version>
- </dependency>
- </dependencies>
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>