From 53de5d070f8b6cc271c1642a5140d368444fc5b7 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 18 Mar 2021 11:56:04 +0100 Subject: Remove the container-core-config module. --- CMakeLists.txt | 1 - cloud-tenant-base-dependencies-enforcer/pom.xml | 1 - container-core-config/CMakeLists.txt | 2 - container-core-config/OWNERS | 1 - container-core-config/README.md | 8 ---- container-core-config/pom.xml | 48 ---------------------- .../com/yahoo/container/core/package-info.java | 5 --- .../container.core.access-log.def | 23 ----------- container-core/pom.xml | 6 --- pom.xml | 1 - 10 files changed, 96 deletions(-) delete mode 100644 container-core-config/CMakeLists.txt delete mode 100644 container-core-config/OWNERS delete mode 100644 container-core-config/README.md delete mode 100644 container-core-config/pom.xml delete mode 100644 container-core-config/src/main/java/com/yahoo/container/core/package-info.java delete mode 100644 container-core-config/src/main/resources/configdefinitions/container.core.access-log.def diff --git a/CMakeLists.txt b/CMakeLists.txt index eae4cb338eb..40f60d7daab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ add_subdirectory(configserver) add_subdirectory(configserver-flags) add_subdirectory(configutil) add_subdirectory(container-core) -add_subdirectory(container-core-config) add_subdirectory(container-di) add_subdirectory(container-disc) add_subdirectory(container-jersey2) diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ee3ed48318b..d821501bd2f 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -149,7 +149,6 @@ com.yahoo.vespa:configdefinitions:*:jar:provided com.yahoo.vespa:configgen:*:jar:provided com.yahoo.vespa:container-core:*:jar:provided - com.yahoo.vespa:container-core-config:*:jar:provided com.yahoo.vespa:container-dev:*:jar:provided com.yahoo.vespa:container-di:*:jar:provided com.yahoo.vespa:container-disc:*:jar:provided diff --git a/container-core-config/CMakeLists.txt b/container-core-config/CMakeLists.txt deleted file mode 100644 index 307bb103e9f..00000000000 --- a/container-core-config/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definitions() diff --git a/container-core-config/OWNERS b/container-core-config/OWNERS deleted file mode 100644 index fb71c67318d..00000000000 --- a/container-core-config/OWNERS +++ /dev/null @@ -1 +0,0 @@ -bjorncs \ No newline at end of file diff --git a/container-core-config/README.md b/container-core-config/README.md deleted file mode 100644 index ac37c242a5f..00000000000 --- a/container-core-config/README.md +++ /dev/null @@ -1,8 +0,0 @@ - -# container-core-config - -Contains config definitions with package `com.yahoo.container.core` that are used by other modules. - -This artifact is embedded inside container-core jar, but built as bundle to allow other modules to depend on container-core config definitions without depending on container-core. -The generated config classes cannot be moved to container-core as it would introduce a cycles in Maven dependency graph. -This works at correctly runtime as OSGi allows cycling dependencies between bundles. diff --git a/container-core-config/pom.xml b/container-core-config/pom.xml deleted file mode 100644 index fb4aea4071e..00000000000 --- a/container-core-config/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - com.yahoo.vespa - parent - 7-SNAPSHOT - ../parent/pom.xml - - container-core-config - 7-SNAPSHOT - container-plugin - - - com.yahoo.vespa - annotations - ${project.version} - provided - - - com.yahoo.vespa - config-lib - ${project.version} - provided - - - - - - com.yahoo.vespa - bundle-plugin - true - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${buildOutputDirectory} - - - ${project.build.directory}/classes/ - - \ No newline at end of file diff --git a/container-core-config/src/main/java/com/yahoo/container/core/package-info.java b/container-core-config/src/main/java/com/yahoo/container/core/package-info.java deleted file mode 100644 index c9c683bd68a..00000000000 --- a/container-core-config/src/main/java/com/yahoo/container/core/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.container.core; - -import com.yahoo.osgi.annotation.ExportPackage; \ No newline at end of file diff --git a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def b/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def deleted file mode 100644 index 69058b3d8da..00000000000 --- a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=container.core - -# File name patterns supporting the expected time variables, e.g. ".%Y%m%d%H%M%S" -fileHandler.pattern string - -# When should rotation happen, in minutes after midnight -# Does this really need to be configurable? -# Could just configure "every N minutes" instead -fileHandler.rotation string default="0 60 ..." - -# Use this as the name of the symlink created pointing to the newest file in the "date" naming scheme. -# This is ignored if the sequence naming scheme is used. -fileHandler.symlink string default="" - -# compress the previous access log after rotation -fileHandler.compressOnRotation bool default=true - -# Compression format -fileHandler.compressionFormat enum {GZIP, ZSTD} default=GZIP - -# Max queue length of file handler -fileHandler.queueSize int default=10000 diff --git a/container-core/pom.xml b/container-core/pom.xml index ea6e7d32310..3310aa07d92 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -97,12 +97,6 @@ org.apache.httpcomponents httpclient - - com.yahoo.vespa - container-core-config - ${project.version} - compile - com.yahoo.vespa vespajlib diff --git a/pom.xml b/pom.xml index def94f212b1..60fe298330f 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ config_test container container-core - container-core-config container-dependencies-enforcer container-dependency-versions container-dev -- cgit v1.2.3