summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--elasticsearch-sg/pom.xml149
-rw-r--r--elasticsearch-sg/src/main/docker/Dockerfile10
-rw-r--r--pom.xml1
3 files changed, 0 insertions, 160 deletions
diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
deleted file mode 100644
index c97f52c..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.5.1-SNAPSHOT</version>
- </parent>
-
-
- <groupId>org.onap.aai.search-data-service</groupId>
- <artifactId>elasticsearch-sg</artifactId>
- <name>ElasticSearch with SearchGuard</name>
- <version>1.5.1-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 0a05863..ea7e027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
<modules>
<module>search-data-service-app</module>
- <module>elasticsearch-sg</module>
</modules>
<properties>