diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2021-01-11 15:48:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-11 15:48:54 +0100 |
commit | 6cbd2302b3ad1a45241e957559fd6f60e5c0bfb2 (patch) | |
tree | 17607e9e4beb7ca95a5ac2ceb69e82166d353487 | |
parent | 2587074c8498d76ed55a93f1935653d2a0bdb1e0 (diff) |
Revert "Merge container-accesslogging into jdisc_http_service"
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
-rw-r--r-- | container-accesslogging/CMakeLists.txt | 2 | ||||
-rw-r--r-- | container-accesslogging/OWNERS | 1 | ||||
-rw-r--r-- | container-accesslogging/README.md | 4 | ||||
-rw-r--r-- | container-accesslogging/pom.xml | 97 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLog.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLog.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogEntry.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogHandler.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogInterface.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogInterface.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogSampler.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/Coverage.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/Coverage.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/HitCounts.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/HitCounts.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/JSONAccessLog.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFormatter.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/TraceRenderer.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/package-info.java (renamed from jdisc_http_service/src/main/java/com/yahoo/container/logging/package-info.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def (renamed from jdisc_http_service/src/main/resources/configdefinitions/container.core.access-log.def) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java) | 1 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java) | 0 | ||||
-rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java (renamed from jdisc_http_service/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java) | 4 | ||||
-rw-r--r-- | container-core/pom.xml | 5 | ||||
-rw-r--r-- | container-search/pom.xml | 6 | ||||
-rw-r--r-- | jdisc_http_service/pom.xml | 12 | ||||
-rw-r--r-- | pom.xml | 1 |
32 files changed, 124 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c8cf6a4467a..aadd31ec2b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,7 @@ add_subdirectory(configgen) add_subdirectory(configserver) add_subdirectory(configserver-flags) add_subdirectory(configutil) +add_subdirectory(container-accesslogging) add_subdirectory(container-core) add_subdirectory(container-di) add_subdirectory(container-disc) diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ecf1ce48eb5..414039ac492 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -145,6 +145,7 @@ <include>com.yahoo.vespa:config:*:jar:provided</include> <include>com.yahoo.vespa:configdefinitions:*:jar:provided</include> <include>com.yahoo.vespa:configgen:*:jar:provided</include> + <include>com.yahoo.vespa:container-accesslogging:*:jar:provided</include> <include>com.yahoo.vespa:container-core:*:jar:provided</include> <include>com.yahoo.vespa:container-dev:*:jar:provided</include> <include>com.yahoo.vespa:container-di:*:jar:provided</include> diff --git a/container-accesslogging/CMakeLists.txt b/container-accesslogging/CMakeLists.txt new file mode 100644 index 00000000000..7bb25e6a420 --- /dev/null +++ b/container-accesslogging/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_config_definitions() diff --git a/container-accesslogging/OWNERS b/container-accesslogging/OWNERS new file mode 100644 index 00000000000..569bf1cc3a1 --- /dev/null +++ b/container-accesslogging/OWNERS @@ -0,0 +1 @@ +bjorncs diff --git a/container-accesslogging/README.md b/container-accesslogging/README.md new file mode 100644 index 00000000000..1d5b7d140e9 --- /dev/null +++ b/container-accesslogging/README.md @@ -0,0 +1,4 @@ +<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +# Access logging for JDisc + +Contains various access log implementations for JDisc. diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml new file mode 100644 index 00000000000..ba544e04fc8 --- /dev/null +++ b/container-accesslogging/pom.xml @@ -0,0 +1,97 @@ +<?xml version="1.0"?> +<!-- Copyright 2017 Yahoo Holdings. 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>container-accesslogging</artifactId> + <version>7-SNAPSHOT</version> + <packaging>container-plugin</packaging> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <scope>provided</scope> + <classifier>no_aop</classifier> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>component</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-bundle</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config-lib</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespalog</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + </plugins> + <outputDirectory>${buildOutputDirectory}</outputDirectory> + </build> + <properties> + <buildOutputDirectory>${project.build.directory}/classes/</buildOutputDirectory> + </properties> +</project> diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLog.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLog.java index 5c1a549070c..5c1a549070c 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLog.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLog.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java index d8085cc808b..d8085cc808b 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogEntry.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java index 488a6137cc2..488a6137cc2 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogHandler.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogInterface.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogInterface.java index 2523174abef..2523174abef 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogInterface.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogInterface.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogSampler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java index 12d29c2f333..12d29c2f333 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/AccessLogSampler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogSampler.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java index dc749c71613..dc749c71613 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/CircularArrayAccessLogKeeper.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/Coverage.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/Coverage.java index 9d122b90641..9d122b90641 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/Coverage.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/Coverage.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/HitCounts.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/HitCounts.java index fed12281962..fed12281962 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/HitCounts.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/HitCounts.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONAccessLog.java index a84903467b6..a84903467b6 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONAccessLog.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java index ae794e5b60a..ae794e5b60a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index 75e9febc192..75e9febc192 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFormatter.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java index cc1dcb579aa..cc1dcb579aa 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFormatter.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFormatter.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/TraceRenderer.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java index 295786aa15d..295786aa15d 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/TraceRenderer.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java index 054fc0fcbf7..054fc0fcbf7 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/package-info.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/package-info.java index fc2abb7b609..fc2abb7b609 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/package-info.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/package-info.java diff --git a/jdisc_http_service/src/main/resources/configdefinitions/container.core.access-log.def b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def index 788fadcdf90..788fadcdf90 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/container.core.access-log.def +++ b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java index 32a55b4bb72..35664049560 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/AccessLogSamplerTest.java @@ -3,6 +3,7 @@ package com.yahoo.container.logging; import org.junit.Test; +import java.net.URI; import java.util.ArrayList; import java.util.List; diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java index 5d9509eb045..5d9509eb045 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/CircularArrayAccessLogKeeperTest.java diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java index 2099037203f..2099037203f 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/CompressWhileDrop.java diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java index 6c7878f99ed..6c7878f99ed 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java index bc7257b1ca9..bc7257b1ca9 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java index ecacf95d100..cb34818c35c 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java @@ -1,11 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.logging.test; +import java.util.Date; + import com.yahoo.container.logging.LogFormatter; import org.junit.Test; -import java.util.Date; - import static org.junit.Assert.assertEquals; /** diff --git a/container-core/pom.xml b/container-core/pom.xml index 506f5575be4..0fbb590a1de 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -41,6 +41,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-accesslogging</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/container-search/pom.xml b/container-search/pom.xml index 074f5827122..6fa32947869 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -67,6 +67,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-accesslogging</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-core</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 4589dbb6a68..094ca7baa25 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -68,24 +68,23 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>security-utils</artifactId> + <artifactId>container-accesslogging</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> + <artifactId>security-utils</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>vespalog</artifactId> + <artifactId>yolean</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> - <!-- TEST SCOPE --> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -128,11 +127,6 @@ <artifactId>bcpkix-jdk15on</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> @@ -54,6 +54,7 @@ <module>config_test</module> <module>container</module> <module>container-core</module> + <module>container-accesslogging</module> <module>container-dependencies-enforcer</module> <module>container-dependency-versions</module> <module>container-dev</module> |