summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parent/pom.xml5
-rw-r--r--vespa-enforcer-extensions/pom.xml1
-rw-r--r--vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java1
-rw-r--r--vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java1
4 files changed, 7 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b7ff4b2437..66909b227f4 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>
diff --git a/vespa-enforcer-extensions/pom.xml b/vespa-enforcer-extensions/pom.xml
index 96df2c2ac33..fe1f2d1933b 100644
--- a/vespa-enforcer-extensions/pom.xml
+++ b/vespa-enforcer-extensions/pom.xml
@@ -18,7 +18,6 @@
<dependency>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer-api</artifactId>
- <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
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";