diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-17 14:42:08 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-17 15:37:23 +0100 |
commit | a3360bbe444516174b319b4f1b9239952fa77775 (patch) | |
tree | a5b7179ab2cfa0c6f794961c5be0655ae61ec653 | |
parent | 7ce56f0c58d1d3448bc9f8713d58877e29016e5e (diff) |
Use single versions of dependencies
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java | 2 | ||||
-rw-r--r-- | config-class-plugin/pom.xml | 3 | ||||
-rw-r--r-- | jaxrs_utils/pom.xml | 1 | ||||
-rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 38 | ||||
-rw-r--r-- | parent/pom.xml | 36 | ||||
-rw-r--r-- | routing-generator/pom.xml | 1 | ||||
-rw-r--r-- | testutil/src/main/java/com/yahoo/vespa/test/file/UnixUidGidAttributeProvider.java | 2 | ||||
-rw-r--r-- | vespa-application-maven-plugin/pom.xml | 1 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 16 |
9 files changed, 42 insertions, 58 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java index 5b4c9590935..1bb2ad55ac4 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractAssembleBundleMojo.java @@ -48,7 +48,7 @@ abstract class AbstractAssembleBundleMojo extends AbstractMojo { MavenArchiver mavenArchiver = new MavenArchiver(); mavenArchiver.setArchiver(jarArchiver); mavenArchiver.setOutputFile(jarFile.toFile()); - mavenArchiver.configureReproducible("1"); + mavenArchiver.configureReproducibleBuild("1"); try { mavenArchiver.createArchive(session, project, archiveConfiguration); } catch (Exception e) { diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 26dac276ea2..4df0b53328c 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -16,13 +16,11 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.5.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.5.0</version> <scope>provided</scope> </dependency> <dependency> @@ -33,7 +31,6 @@ <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> - <version>3.5</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index cb7839bc73d..c174fea1092 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -19,7 +19,6 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 9ffc7986179..4c0304fbc71 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -12,72 +12,44 @@ com.google.guava:guava:27.1-jre com.google.inject:guice:4.2.3:no_aop com.google.j2objc:j2objc-annotations:1.1 commons-io:commons-io:2.11.0 -commons-io:commons-io:2.7 javax.annotation:javax.annotation-api:1.2 -javax.annotation:jsr250-api:1.0 -javax.enterprise:cdi-api:1.0 javax.inject:javax.inject:1 org.apache.commons:commons-compress:1.21 -org.apache.commons:commons-lang3:3.5 -org.apache.commons:commons-lang3:3.8.1 -org.apache.maven:maven-archiver:3.5.2 +org.apache.commons:commons-lang3:3.11 +org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.6 -org.apache.maven:maven-builder-support:3.5.0 org.apache.maven:maven-builder-support:3.8.6 -org.apache.maven:maven-core:3.5.0 org.apache.maven:maven-core:3.8.6 org.apache.maven:maven-model:3.8.6 -org.apache.maven:maven-model-builder:3.5.0 org.apache.maven:maven-model-builder:3.8.6 -org.apache.maven:maven-plugin-api:3.5.0 -org.apache.maven:maven-plugin-api:3.8.5 -org.apache.maven:maven-repository-metadata:3.5.0 +org.apache.maven:maven-plugin-api:3.8.6 org.apache.maven:maven-repository-metadata:3.8.6 -org.apache.maven:maven-resolver-provider:3.5.0 org.apache.maven:maven-resolver-provider:3.8.6 -org.apache.maven:maven-settings:3.5.0 org.apache.maven:maven-settings:3.8.6 -org.apache.maven:maven-settings-builder:3.5.0 org.apache.maven:maven-settings-builder:3.8.6 org.apache.maven.enforcer:enforcer-api:3.0.0 -org.apache.maven.plugin-tools:maven-plugin-annotations:3.5 org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4 -org.apache.maven.resolver:maven-resolver-api:1.0.3 org.apache.maven.resolver:maven-resolver-api:1.6.3 -org.apache.maven.resolver:maven-resolver-impl:1.0.3 org.apache.maven.resolver:maven-resolver-impl:1.6.3 -org.apache.maven.resolver:maven-resolver-spi:1.0.3 org.apache.maven.resolver:maven-resolver-spi:1.6.3 -org.apache.maven.resolver:maven-resolver-util:1.0.3 org.apache.maven.resolver:maven-resolver-util:1.6.3 org.apache.maven.shared:maven-dependency-tree:3.1.1 -org.apache.maven.shared:maven-shared-utils:3.1.0 -org.apache.maven.shared:maven-shared-utils:3.3.3 org.apache.maven.shared:maven-shared-utils:3.3.4 -org.codehaus.plexus:plexus-archiver:4.2.7 +org.codehaus.plexus:plexus-archiver:4.4.0 org.codehaus.plexus:plexus-cipher:2.0 -org.codehaus.plexus:plexus-classworlds:2.5.2 org.codehaus.plexus:plexus-classworlds:2.6.0 -org.codehaus.plexus:plexus-component-annotations:1.7.1 org.codehaus.plexus:plexus-component-annotations:2.1.0 -org.codehaus.plexus:plexus-interpolation:1.24 org.codehaus.plexus:plexus-interpolation:1.26 -org.codehaus.plexus:plexus-io:3.2.0 +org.codehaus.plexus:plexus-io:3.4.0 org.codehaus.plexus:plexus-sec-dispatcher:2.0 -org.codehaus.plexus:plexus-utils:3.0.24 -org.codehaus.plexus:plexus-utils:3.3.0 org.codehaus.plexus:plexus-utils:3.3.1 org.eclipse.aether:aether-util:1.1.0 -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.3 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.3 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 org.iq80.snappy:snappy:0.4 org.ow2.asm:asm:9.3 org.slf4j:slf4j-api:1.7.32 org.slf4j:slf4j-simple:1.7.22 -org.sonatype.plexus:plexus-cipher:1.4 -org.sonatype.plexus:plexus-sec-dispatcher:1.4 org.tukaani:xz:1.9 org.twdata.maven:mojo-executor:2.3.0 diff --git a/parent/pom.xml b/parent/pom.xml index 1c9f4d387bb..eaed6b398ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -40,7 +40,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-external</artifactId> - <version>2.7</version> + <version>${maven-wagon.version}</version> </extension> <extension> <groupId>org.apache.maven.archetype</groupId> @@ -540,7 +540,7 @@ <dependency> <groupId>com.google.jimfs</groupId> <artifactId>jimfs</artifactId> - <version>1.1</version> + <version>1.2</version> <scope>test</scope> <!-- TODO: remove scope from parent pom --> </dependency> <dependency> @@ -607,6 +607,11 @@ <version>${commons-io.version}</version> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.11</version> + </dependency> + <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-api</artifactId> <version>${jjwt.version}</version> @@ -804,6 +809,16 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>${maven-core.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${maven-core.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven-plugin-api.version}</version> </dependency> @@ -836,7 +851,12 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-external</artifactId> - <version>2.7</version> + <version>${maven-wagon.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> + <version>${maven-wagon.version}</version> </dependency> <dependency> <groupId>org.apache.opennlp</groupId> @@ -854,6 +874,11 @@ <version>3.11.1</version> </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> + <version>1.26</version> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk18on</artifactId> <version>${bouncycastle.version}</version> @@ -1108,7 +1133,7 @@ <jjwt.version>0.11.2</jjwt.version> <jna.version>5.11.0</jna.version> <junit.version>5.8.1</junit.version> - <maven-archiver.version>3.5.2</maven-archiver.version> + <maven-archiver.version>3.6.0</maven-archiver.version> <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version> <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> @@ -1120,12 +1145,13 @@ <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version> - <maven-plugin-api.version>3.8.5</maven-plugin-api.version> + <maven-plugin-api.version>3.8.6</maven-plugin-api.version> <maven-plugin-tools.version>3.6.4</maven-plugin-tools.version> <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version> <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version> <maven-site-plugin.version>3.9.1</maven-site-plugin.version> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> + <maven-wagon.version>2.10</maven-wagon.version> <mockito.version>4.0.0</mockito.version> <netty.version>4.1.85.Final</netty.version> <netty-tcnative.version>2.0.54.Final</netty-tcnative.version> diff --git a/routing-generator/pom.xml b/routing-generator/pom.xml index 032d58acb51..0c320a85a1d 100644 --- a/routing-generator/pom.xml +++ b/routing-generator/pom.xml @@ -25,7 +25,6 @@ <dependency> <groupId>com.google.jimfs</groupId> <artifactId>jimfs</artifactId> - <version>1.2</version> <scope>test</scope> </dependency> <dependency> diff --git a/testutil/src/main/java/com/yahoo/vespa/test/file/UnixUidGidAttributeProvider.java b/testutil/src/main/java/com/yahoo/vespa/test/file/UnixUidGidAttributeProvider.java index 13c51851540..903706a503d 100644 --- a/testutil/src/main/java/com/yahoo/vespa/test/file/UnixUidGidAttributeProvider.java +++ b/testutil/src/main/java/com/yahoo/vespa/test/file/UnixUidGidAttributeProvider.java @@ -115,7 +115,7 @@ public class UnixUidGidAttributeProvider extends AttributeProvider { file.setAttribute("posix", "group", new BasicGroupPrincipal(String.valueOf(value))); return; } - throw unsettable(view, attribute); + throw unsettable(view, attribute, create); } @SuppressWarnings("OctalInteger") diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index d2d960f6112..5a20a5a34b8 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -49,7 +49,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.7</version> </dependency> </dependencies> <build> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 5ae1a45841f..58830f22ab3 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -75,7 +75,6 @@ javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 javax.servlet:javax.servlet-api:3.1.0 javax.validation:validation-api:1.1.0.Final -javax.ws.rs:javax.ws.rs-api:2.0 javax.ws.rs:javax.ws.rs-api:2.0.1 javax.xml.bind:jaxb-api:2.3.0 joda-time:joda-time:2.8.1 @@ -87,7 +86,6 @@ org.apache.commons:commons-compress:1.21 org.apache.commons:commons-csv:1.8 org.apache.commons:commons-exec:1.3 org.apache.commons:commons-lang3:3.11 -org.apache.commons:commons-lang3:3.8.1 org.apache.commons:commons-math3:3.6.1 org.apache.curator:curator-client:5.3.0 org.apache.curator:curator-framework:5.3.0 @@ -100,7 +98,7 @@ org.apache.httpcomponents:httpmime:4.5.13 org.apache.httpcomponents.client5:httpclient5:5.1.3 org.apache.httpcomponents.core5:httpcore5:5.1.3 org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 -org.apache.maven:maven-archiver:3.5.2 +org.apache.maven:maven-archiver:3.6.0 org.apache.maven:maven-artifact:3.8.6 org.apache.maven:maven-artifact-manager:2.2.1 org.apache.maven:maven-builder-support:3.8.6 @@ -108,14 +106,12 @@ org.apache.maven:maven-compat:3.0 org.apache.maven:maven-core:3.8.6 org.apache.maven:maven-model:3.8.6 org.apache.maven:maven-model-builder:3.8.6 -org.apache.maven:maven-plugin-api:3.8.5 +org.apache.maven:maven-plugin-api:3.8.6 org.apache.maven:maven-plugin-registry:2.2.1 org.apache.maven:maven-profile:2.2.1 org.apache.maven:maven-project:2.2.1 -org.apache.maven:maven-repository-metadata:2.2.1 org.apache.maven:maven-repository-metadata:3.8.6 org.apache.maven:maven-resolver-provider:3.8.6 -org.apache.maven:maven-settings:2.2.1 org.apache.maven:maven-settings:3.8.6 org.apache.maven:maven-settings-builder:3.8.6 org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4 @@ -127,7 +123,6 @@ org.apache.maven.resolver:maven-resolver-util:1.6.3 org.apache.maven.shared:file-management:3.0.0 org.apache.maven.shared:maven-shared-io:3.0.0 org.apache.maven.shared:maven-shared-utils:3.2.1 -org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 org.apache.maven.wagon:wagon-provider-api:2.10 org.apache.opennlp:opennlp-tools:1.9.3 org.apache.velocity:velocity-engine-core:2.3 @@ -143,11 +138,10 @@ org.codehaus.plexus:plexus-cipher:2.0 org.codehaus.plexus:plexus-classworlds:2.6.0 org.codehaus.plexus:plexus-component-annotations:1.5.5 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 -org.codehaus.plexus:plexus-interpolation:1.11 org.codehaus.plexus:plexus-interpolation:1.26 -org.codehaus.plexus:plexus-io:3.2.0 +org.codehaus.plexus:plexus-io:3.4.0 org.codehaus.plexus:plexus-sec-dispatcher:2.0 -org.codehaus.plexus:plexus-utils:3.3.0 +org.codehaus.plexus:plexus-utils:3.3.1 org.eclipse.collections:eclipse-collections:11.0.0 org.eclipse.collections:eclipse-collections-api:11.0.0 org.eclipse.jetty:jetty-alpn-java-server:9.4.49.v20220914 @@ -227,7 +221,6 @@ xml-apis:xml-apis:1.4.01 # Contains dependencies that are used exclusively in 'test' scope com.github.tomakehurst:wiremock-jre8-standalone:2.35.0 com.google.guava:guava-testlib:27.1-jre -com.google.jimfs:jimfs:1.1 com.google.jimfs:jimfs:1.2 junit:junit:4.13.2 net.bytebuddy:byte-buddy:1.11.19 @@ -235,7 +228,6 @@ net.bytebuddy:byte-buddy-agent:1.11.19 org.apache.curator:curator-test:5.3.0 org.assertj:assertj-core:3.11.1 org.checkerframework:checker-qual:2.5.2 -org.codehaus.plexus:plexus-utils:3.3.1 org.cthul:cthul-matchers:1.0 org.hamcrest:hamcrest-all:1.3 org.hamcrest:hamcrest-core:1.3 |