From: rajeevme <rajeev.mehta@amdocs.com>
Date: Wed, 9 Oct 2019 12:10:28 +0000 (+0530)
Subject: [AAI-2676] Search guard is no longer available
X-Git-Tag: 1.6.1~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsearch-data-service.git;a=commitdiff_plain;h=9c2b439f5046d730866264ec0174fe64450d5cc8

[AAI-2676] Search guard is no longer available

Issue-ID: AAI-2676

Change-Id: I0a5586ce9eb943a9b863be2d536d9e812369ba42

Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
Change-Id: I4206eb25205c275d4f0b721185445df9225f9c22
---

diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
deleted file mode 100644
index 8b35a82..0000000
--- a/elasticsearch-sg/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-    Copyright © 2017-2018 Amdocs
-    ================================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ============LICENSE_END=========================================================
-
--->
-<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>
-
-    <parent>
-        <artifactId>search-data-service</artifactId>
-        <groupId>org.onap.aai</groupId>
-        <version>1.6.0-SNAPSHOT</version>
-    </parent>
-
-
-    <groupId>org.onap.aai.search-data-service</groupId>
-    <artifactId>elasticsearch-sg</artifactId>
-    <name>ElasticSearch with SearchGuard</name>
-    <version>1.6.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.0.0</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
-                        <executions>
-                            <execution>
-                                <id>copy-docker-file</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${aai.build.directory}</outputDirectory>
-                                    <overwrite>true</overwrite>
-                                    <resources>
-                                        <resource>
-                                            <directory>${basedir}/src/main/docker</directory>
-                                            <includes>
-                                                <include>**/*</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>${docker.fabric.version}</version>
-                        <configuration>
-                            <verbose>true</verbose>
-                            <apiVersion>1.23</apiVersion>
-                            <images>
-                                <image>
-                                    <name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l
-                                    </name>
-                                    <build>
-                                        <filter>@</filter>
-                                        <tags>
-                                            <tag>latest</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
-                                        </tags>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${aai.build.directory}</dockerFileDir>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>clean-images</id>
-                                <phase>clean</phase>
-                                <goals>
-                                    <goal>remove</goal>
-                                </goals>
-                                <configuration>
-                                    <removeAll>true</removeAll>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-images</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-</project>
diff --git a/elasticsearch-sg/src/main/docker/Dockerfile b/elasticsearch-sg/src/main/docker/Dockerfile
deleted file mode 100644
index 0ccb31d..0000000
--- a/elasticsearch-sg/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# https://github.com/elastic/elasticsearch-docker
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.1.2
-
-USER elasticsearch
-
-# Search Guard plugin
-RUN elasticsearch-plugin install --batch com.floragunn:search-guard-6:6.1.2-22.3 \
-	&& chmod +x plugins/search-guard-6/tools/*.sh
-
-ENTRYPOINT ["/usr/share/elasticsearch/bin/run.sh"]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index abbd898..ed2455e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,83 +21,82 @@
 
 -->
 <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>
-	<parent>
+    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>
+    <parent>
           <groupId>org.onap.oparent</groupId>
           <artifactId>oparent</artifactId>
           <version>2.0.0</version>
-	</parent>
-	<groupId>org.onap.aai</groupId>
-	<artifactId>search-data-service</artifactId>
-	<name>aai-search-data-service aggregate pom</name>
-	<version>1.6.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    </parent>
+    <groupId>org.onap.aai</groupId>
+    <artifactId>search-data-service</artifactId>
+    <name>aai-search-data-service aggregate pom</name>
+    <version>1.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<modules>
-		<module>search-data-service-app</module>
-		<module>elasticsearch-sg</module>
-	</modules>
+    <modules>
+        <module>search-data-service-app</module>
+    </modules>
 
-	<properties>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<!-- docker related properties -->
-		<docker.fabric.version>0.31.0</docker.fabric.version>
-		<aai.docker.version>1.0.0</aai.docker.version>
-		<aai.docker.namespace>onap</aai.docker.namespace>
-		<aai.base.image>alpine</aai.base.image>
-		<aai.base.image.version>1.6.0</aai.base.image.version>
-		<aai.build.directory>${project.build.directory}/${project.artifactId}-build/</aai.build.directory>
-		<!-- This will be used for the docker images as the default format of maven build has issues -->
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-	</properties>
+    <properties>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <!-- docker related properties -->
+        <docker.fabric.version>0.31.0</docker.fabric.version>
+        <aai.docker.version>1.0.0</aai.docker.version>
+        <aai.docker.namespace>onap</aai.docker.namespace>
+        <aai.base.image>alpine</aai.base.image>
+        <aai.base.image.version>1.6.0</aai.base.image.version>
+        <aai.build.directory>${project.build.directory}/${project.artifactId}-build/</aai.build.directory>
+        <!-- This will be used for the docker images as the default format of maven build has issues -->
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+    </properties>
 
-	<profiles>
-		<profile>
-			<id>docker</id>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>3.0.0</version>
-							<executions>
-								<execution>
-									<phase>pre-clean</phase>
-									<id>parse-version</id>
-									<goals>
-										<goal>parse-version</goal>
-									</goals>
-								</execution>
-							</executions>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>build-helper-maven-plugin</artifactId>
+                            <version>3.0.0</version>
+                            <executions>
+                                <execution>
+                                    <phase>pre-clean</phase>
+                                    <id>parse-version</id>
+                                    <goals>
+                                        <goal>parse-version</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 
-	<build>
-		<plugins>
-			<plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-deploy-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${nexusproxy}/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${nexusproxy}/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 
 </project>