diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-06 13:20:04 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-09 12:49:33 +0200 |
| commit | e056e4faf903ba1d01d2a22f482fd0ab7cfb484b (patch) | |
| tree | dcca7b53036ee7804fbe09ff75da43ec3232a6f7 | |
| parent | 0c0aad4f0c2950a494e7d6d8216245caf7b23e40 (diff) | |
Make jdisc-security-filters a pre-install requirement of jdisc
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc-security-filters/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | standalone-container/vespa-standalone-container.spec | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b34def92c9..23dcef6d96d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ add_subdirectory(filedistribution) add_subdirectory(fnet) add_subdirectory(fsa) add_subdirectory(jdisc_core) +add_subdirectory(jdisc-security-filters) add_subdirectory(jdisc_http_service) add_subdirectory(jdisc_jetty) add_subdirectory(jrt_test) diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 9128d1033be..c726ea94d48 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -179,6 +179,7 @@ container-jersey2-jar-with-dependencies.jar, container-search-and-docproc-jar-with-dependencies.jar, docprocs-jar-with-dependencies.jar, + jdisc-security-filters-jar-with-dependencies.jar, jdisc_http_service-jar-with-dependencies.jar, vespaclient-container-plugin-jar-with-dependencies.jar, vespa-athenz-jar-with-dependencies.jar, diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt new file mode 100644 index 00000000000..b20883d3154 --- /dev/null +++ b/jdisc-security-filters/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(jdisc-security-filters) +install_java_artifact_dependencies(jdisc-security-filters) + +install_config_definition(src/main/resources/configdefinitions/cors-security-filter.def) diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index bd78f4e36a2..c0d6a162c83 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -50,6 +50,7 @@ declare -a modules=( container-search-and-docproc defaults docprocs + jdisc-security-filters jdisc_core jdisc_http_service simplemetrics |