From: waqas.ikram <waqas.ikram@est.tech>
Date: Wed, 10 Feb 2021 15:55:37 +0000 (+0000)
Subject: Revert "Changing docker module packaging to JAR"
X-Git-Tag: 1.8.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1f18566c5cfbf346309dec5ddf5d59c1f479467a;p=so.git

Revert "Changing docker module packaging to JAR"

This reverts commit 40fc9d52b0ca2eaba6d1e30f846797e301dc885b.

Reason for revert: it seems that docker module in SO is triggered by “docker” profile which is only triggered in so-maven-docker-* Jenkins job. Per my understanding these jobs are only used for creating docker images and I think relying on these jobs to create a docker JAR module will create unnecessary dependency. So I think option 3 is more feasible

Change-Id: Ia64778afd8fe4105ee8bf1a2f45a4d5674601289
Issue-ID: SO-3473
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
---

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 1f26238864..abf2c8a634 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -9,7 +9,7 @@
     <version>1.7.1-SNAPSHOT</version>
   </parent>
 
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <artifactId>docker</artifactId>
   <name>Docker Images</name>
   <description>Docker Images</description>
@@ -29,11 +29,6 @@
 
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
-    <resources>
-        <resource>
-            <directory>src/main/docker</directory>
-        </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.groovy.maven</groupId>