diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-03-18 17:42:52 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-03-23 22:58:12 +0100 |
| commit | f241e4ec9042a21dc85c02aeb94a448acf1a67cf (patch) | |
| tree | 5cf897d35948bd9bd1aad3a8ad3026faa60bb33b /container-core/pom.xml | |
| parent | 53de5d070f8b6cc271c1642a5140d368444fc5b7 (diff) | |
Rearrange deps, no functional changes.
Diffstat (limited to 'container-core/pom.xml')
| -rw-r--r-- | container-core/pom.xml | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 3310aa07d92..e913d1d6d38 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -29,33 +29,27 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>http-utils</artifactId> + <artifactId>container-documentapi</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>linguistics</artifactId> + <artifactId>document</artifactId> <version>${project.version}</version> <exclusions> <exclusion> - <!-- Pulled in by language-detector in scope compile --> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> - <!-- Pulled in by language-detector in scope compile --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>messagebus</artifactId> + <artifactId>fileacquirer</artifactId> <version>${project.version}</version> <exclusions> <exclusion> @@ -70,47 +64,48 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>document</artifactId> + <artifactId>http-utils</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>linguistics</artifactId> <version>${project.version}</version> <exclusions> <exclusion> + <!-- Pulled in by language-detector in scope compile --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> <exclusion> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config</artifactId> + <!-- Pulled in by language-detector in scope compile --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-documentapi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vdslib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespajlib</artifactId> + <artifactId>messagebus</artifactId> <version>${project.version}</version> <exclusions> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>config</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>fileacquirer</artifactId> + <artifactId>statistics</artifactId> <version>${project.version}</version> <exclusions> <exclusion> @@ -125,23 +120,23 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>statistics</artifactId> + <artifactId>vdslib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> <version>${project.version}</version> <exclusions> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - <exclusion> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config</artifactId> - </exclusion> </exclusions> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> @@ -193,6 +188,18 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>config</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>defaults</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -224,23 +231,11 @@ <artifactId>jetty-servlet</artifactId> <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</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- TEST scope --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-standalone</artifactId> <scope>test</scope> </dependency> <dependency> @@ -250,8 +245,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-standalone</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> @@ -259,6 +254,11 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> |