diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-07-10 17:24:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-10 17:24:45 +0200 |
commit | 30225aa2d28901149cd179b24d604debc9728cce (patch) | |
tree | 5384b9e8158479b4c85c2914df2326a4179e19e1 | |
parent | 15890ec476af05469bc37921233025e9a502f0f3 (diff) | |
parent | a17e63a5a5be8bf5742598a17839ec401cb10912 (diff) |
Merge pull request #27700 from vespa-engine/renovate/maven-enforcer-plugin.version
Update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.3.0
7 files changed, 37 insertions, 13 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 1094aa4d3c1..78103f4beb5 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -58,7 +58,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.0</version> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 7ca96a4d8b7..f2d4c6ab012 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -195,7 +195,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.0</version> <executions> <execution> <id>enforce-java</id> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index d504357b07c..99d4d227305 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -28,7 +28,7 @@ org.apache.maven:maven-repository-metadata:3.8.7 org.apache.maven:maven-resolver-provider:3.8.7 org.apache.maven:maven-settings:3.8.7 org.apache.maven:maven-settings-builder:3.8.7 -org.apache.maven.enforcer:enforcer-api:3.0.0 +org.apache.maven.enforcer:enforcer-api:3.3.0 org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.4 org.apache.maven.plugins:maven-shade-plugin:3.4.1 org.apache.maven.resolver:maven-resolver-api:1.6.3 @@ -37,7 +37,6 @@ org.apache.maven.resolver:maven-resolver-spi:1.6.3 org.apache.maven.resolver:maven-resolver-util:1.6.3 org.apache.maven.shared:maven-artifact-transfer:0.13.1 org.apache.maven.shared:maven-common-artifact-filters:3.1.0 -org.apache.maven.shared:maven-dependency-tree:3.1.1 org.apache.maven.shared:maven-dependency-tree:3.2.0 org.apache.maven.shared:maven-shared-utils:3.3.4 org.codehaus.plexus:plexus-archiver:4.4.0 @@ -50,7 +49,6 @@ org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:3.3.1 org.eclipse.aether:aether-api:1.0.0.v20140518 org.eclipse.aether:aether-util:1.0.0.v20140518 -org.eclipse.aether:aether-util:1.1.0 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 org.iq80.snappy:snappy:0.4 diff --git a/parent/pom.xml b/parent/pom.xml index 88248571ee7..f240f80c3c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -826,6 +826,11 @@ <version>2.2.1</version> </dependency> <dependency> + <groupId>org.apache.maven.enforcer</groupId> + <artifactId>enforcer-api</artifactId> + <version>${maven-enforcer-plugin.version}</version> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>${maven-plugin-tools.version}</version> @@ -836,6 +841,11 @@ <version>${maven-jar-plugin.version}</version> </dependency> <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + <version>3.2.0</version> + </dependency> + <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-junit4</artifactId> <version>${surefire.version}</version> @@ -1162,7 +1172,7 @@ <maven-core.version>3.8.7</maven-core.version> <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version> <!-- NOTE: When upgrading, also update explicit versions in tenant base poms! --> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> - <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> + <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version> <maven-failsafe-plugin.version>3.0.0-M6</maven-failsafe-plugin.version> <maven-install-plugin.version>3.1.1</maven-install-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> diff --git a/vespa-enforcer-extensions/pom.xml b/vespa-enforcer-extensions/pom.xml index 96df2c2ac33..4c006cb393f 100644 --- a/vespa-enforcer-extensions/pom.xml +++ b/vespa-enforcer-extensions/pom.xml @@ -16,15 +16,13 @@ <dependencies> <dependency> - <groupId>org.apache.maven.enforcer</groupId> - <artifactId>enforcer-api</artifactId> - <version>3.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>3.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.enforcer</groupId> + <artifactId>enforcer-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -50,6 +48,22 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java index 4ff363a3e4e..05ae7005c1f 100644 --- a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java +++ b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java @@ -31,6 +31,7 @@ import java.util.regex.Pattern; * * @author bjorncs */ +@SuppressWarnings("deprecation") public class EnforceDependencies implements EnforcerRule { private List<String> allowedDependencies = List.of(); diff --git a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java index 3787d84e4be..3db1019a2b1 100644 --- a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java +++ b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java @@ -38,6 +38,7 @@ import java.util.stream.Stream; /** * @author bjorncs */ +@SuppressWarnings("deprecation") public class EnforceDependenciesAllProjects implements EnforcerRule { private static final String WRITE_SPEC_PROP = "dependencyEnforcer.writeSpec"; |