summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-01-28 10:05:17 +0100
committerMorten Tokle <mortent@verizonmedia.com>2021-01-28 10:05:17 +0100
commit23a76359294ed1cf47741741c2d122fc13b1d088 (patch)
treebfa14cb29a43eec5e8c1762c6a99f17e24ec2206
parent7affc0fb85f585d324ea03be0b4f9ae4cbd641aa (diff)
Create new module jdisc-cloud-aws
-rw-r--r--CMakeLists.txt1
-rw-r--r--dist/vespa.spec1
-rw-r--r--jdisc-cloud-aws/CMakeLists.txt3
-rw-r--r--jdisc-cloud-aws/OWNERS2
-rw-r--r--jdisc-cloud-aws/pom.xml34
-rw-r--r--pom.xml1
6 files changed, 42 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3621de617a..72df4cf524b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ add_subdirectory(flags)
add_subdirectory(fnet)
add_subdirectory(fsa)
add_subdirectory(hosted-zone-api)
+add_subdirectory(jdisc-cloud-aws)
add_subdirectory(jdisc_core)
add_subdirectory(jdisc-security-filters)
add_subdirectory(jdisc_http_service)
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 50d591bde5c..b19d1c9a201 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -612,6 +612,7 @@ 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
new file mode 100644
index 00000000000..cc53e39f6a5
--- /dev/null
+++ b/jdisc-cloud-aws/CMakeLists.txt
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 00000000000..e3da51bd047
--- /dev/null
+++ b/jdisc-cloud-aws/OWNERS
@@ -0,0 +1,2 @@
+mortent
+oyving
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
new file mode 100644
index 00000000000..fdefbf35376
--- /dev/null
+++ b/jdisc-cloud-aws/pom.xml
@@ -0,0 +1,34 @@
+<?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>
+
+ <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/pom.xml b/pom.xml
index 91286d35c4d..bb0991f1005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<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>