Revert "Create module for jdisc aws resources"

6 files changed, 0 insertions, 71 deletions

diff --git a/dist/vespa.spec b/dist/vespa.spec
index b19d1c9a201..50d591bde5c 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -612,7 +612,6 @@ fi
 %{_prefix}/lib/jars/jackson-*.jar
 %{_prefix}/lib/jars/javassist-*.jar
 %{_prefix}/lib/jars/javax.*.jar
-%{_prefix}/lib/jars/jdisc-cloud-aws-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jdisc_core-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jdisc_http_service-jar-with-dependencies.jar
 %{_prefix}/lib/jars/jdisc-security-filters-jar-with-dependencies.jar
diff --git a/jdisc-cloud-aws/CMakeLists.txt b/jdisc-cloud-aws/CMakeLists.txt
deleted file mode 100644
index cc53e39f6a5..00000000000
--- a/jdisc-cloud-aws/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(jdisc-cloud-aws)
-install_config_definitions()
diff --git a/jdisc-cloud-aws/OWNERS b/jdisc-cloud-aws/OWNERS
deleted file mode 100644
index e3da51bd047..00000000000
--- a/jdisc-cloud-aws/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-mortent
-oyving
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
deleted file mode 100644
index 9089c5785c7..00000000000
--- a/jdisc-cloud-aws/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-  -->
-
-<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>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>parent</artifactId>
-        <version>7-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <artifactId>jdisc-cloud-aws</artifactId>
-    <version>7-SNAPSHOT</version>
-    <packaging>container-plugin</packaging>
-    <name>${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>container-disc</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.yahoo.vespa</groupId>
-                <artifactId>bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java
deleted file mode 100644
index 8e7678723e6..00000000000
--- a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-package com.yahoo.jdisc.cloud.aws;
-
-import com.yahoo.container.jdisc.secretstore.SecretStore;
-
-/**
- * @author mortent
- */
-public class AwsParameterStore implements SecretStore {
-
-    @Override
-    public String getSecret(String key) {
-        return null;
-    }
-
-    @Override
-    public String getSecret(String key, int version) {
-        return null;
-    }
-}
diff --git a/pom.xml b/pom.xml
index bb0991f1005..91286d35c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,6 @@
         <module>indexinglanguage</module>
         <module>jaxrs_client_utils</module>
         <module>jaxrs_utils</module>
-        <module>jdisc-cloud-aws</module>
         <module>jdisc-security-filters</module>
         <module>jdisc_core</module>
         <module>jdisc_core_test</module>