diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-15 23:34:57 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-15 23:34:57 +0000 |
| commit | cc436f402118300a5ffba223480cd63da2345008 (patch) | |
| tree | 8956019993ba06f30e7a6fc1c52980c3e25139f2 | |
| parent | 3188b0ed12db5c43220e99173b949911a3dcd6b6 (diff) | |
- Add compile scope in applicatio/pom.xml
- Exclude in container-dev/pom.xml
| -rw-r--r-- | application/pom.xml | 4 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dev/pom.xml | 4 | ||||
| -rw-r--r-- | container-search/src/main/java/org/apache/commons/math3/distribution/package-info.java | 5 | ||||
| -rw-r--r-- | parent/pom.xml | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/application/pom.xml b/application/pom.xml index d173fec19cf..cd27b53f557 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -120,6 +120,10 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index f81d6584056..224fd47b256 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -90,7 +90,6 @@ <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> <include>commons-logging:commons-logging:[1.1.3]:jar:provided</include> - <include>org.apache.commons:commons-math3:[3.6.1]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> <include>javax.inject:javax.inject:[${javax.inject.version}]:jar:provided</include> <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 738a4cc8700..1bb06ab9694 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -176,6 +176,10 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/container-search/src/main/java/org/apache/commons/math3/distribution/package-info.java b/container-search/src/main/java/org/apache/commons/math3/distribution/package-info.java deleted file mode 100644 index e9fdc761646..00000000000 --- a/container-search/src/main/java/org/apache/commons/math3/distribution/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package org.apache.commons.math3.distribution; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/parent/pom.xml b/parent/pom.xml index 2d371e07d58..454b4677cfa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -481,7 +481,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.6.1</version> + <version>${commons.math3.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -760,6 +760,7 @@ --> <curator.version>2.9.1</curator.version> <jna.version>4.5.2</jna.version> + <commons.math3.version>3.6.1</commons.math3.version> <junit.version>5.4.2</junit.version> <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version> <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version> |