From ed12890b0bb0c07acd3eb7bcbd10bfcca3046a2b Mon Sep 17 00:00:00 2001
From: sheetalm <sheetal.mudholkar@amdocs.com>
Date: Tue, 13 Mar 2018 19:32:08 +0530
Subject: Activity Spec Service - Dockerization

Resolving merge conflict
Fixing todo items after rebase.
URL to be /activity-spec-api. Removing unused image. Renaming css
Configuring docker registry to push images and adding docker profile
Add maven docker module to generate below docker images
1 activity-spec-init:1.2.0-SNAPSHOT - creates cassandra keyspace and tables
  in already running cassandra docker image
2 activity-spec-be:1.2.0-SNAPSHOT - deploys activity spec war and swagger war on base jetty docker image

Change-Id: Ic638e2cb9c224e9e6c91cf0f7198594593a77ae5
Issue-ID: SDC-1048
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
---
 .../activity-spec-web/activity-spec-service/pom.xml | 21 ++++-----------------
 .../activityspec/mocks/ItemManagerMock.java         | 15 +++++++--------
 2 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'services/activity-spec/activity-spec-web/activity-spec-service')

diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
index 13d0268fde..6247184afb 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/pom.xml
@@ -1,19 +1,20 @@
 <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>
 
     <artifactId>activity-spec-service</artifactId>
-    <name>activity-spec-service</name>
 
     <parent>
         <groupId>org.openecomp.activityspec</groupId>
-        <artifactId>activity-spec-web</artifactId>
+        <artifactId>activity-spec</artifactId>
         <version>1.2.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
-
     <properties>
+        <!-- TODO: Is it required -->
         <errorcode.dir>${project.build.directory}/generated-sources/error-codes</errorcode.dir>
     </properties>
 
@@ -24,15 +25,12 @@
             <artifactId>openecomp-sdc-common-rest</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
             <version>${cxf.version}</version>
             <scope>runtime</scope>
         </dependency>
-
-        <!-- Java Stuff -->
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-versioning-core</artifactId>
@@ -49,7 +47,6 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
@@ -76,14 +73,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mvn.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java b/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
index 2a0586c003..060e29ccb1 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
+++ b/services/activity-spec/activity-spec-web/activity-spec-service/src/test/java/org/openecomp/activityspec/mocks/ItemManagerMock.java
@@ -54,34 +54,33 @@ public class ItemManagerMock implements ItemManager {
 
   @Override
   public void updateVersionStatus(String itemId, VersionStatus addedVersionStatus,
-                                  VersionStatus removedVersionStatus) {
-
+      VersionStatus removedVersionStatus) {
+    // noop
   }
 
   @Override
   public void archive(Item item) {
-
+    // noop
   }
 
-  @Override
   public void restore(Item item) {
-
+    // noop
   }
 
 
   @Override
   public void updateName(String itemId, String name) {
-
+    // noop
   }
 
   @Override
   public void update(Item item) {
-
+    // noop
   }
 
   @Override
   public void delete(Item item) {
-
+    // noop
   }
 
 }
-- 
cgit 1.2.3-korg