From bd0f9bd3526fafe1db0920b476853da18af2467a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Jul 2023 11:24:38 +0000
Subject: Update dependency org.apache.maven.plugins:maven-enforcer-plugin to
 v3.3.0

---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'parent/pom.xml')

diff --git a/parent/pom.xml b/parent/pom.xml
index 6b855ce637f..4b7ff4b2437 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1162,7 +1162,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>
-- 
cgit v1.2.3


From 7ecd885cfc4cfae749af81355f9954b7779f144c Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Mon, 10 Jul 2023 15:57:57 +0200
Subject: Match version of enforcer plugin

---
 parent/pom.xml                                                       | 5 +++++
 vespa-enforcer-extensions/pom.xml                                    | 1 -
 .../com/yahoo/vespa/maven/plugin/enforcer/EnforceDependencies.java   | 1 +
 .../vespa/maven/plugin/enforcer/EnforceDependenciesAllProjects.java  | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'parent/pom.xml')

diff --git a/parent/pom.xml b/parent/pom.xml
index 4b7ff4b2437..66909b227f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -825,6 +825,11 @@
                 <artifactId>maven-project</artifactId>
                 <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>
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";
-- 
cgit v1.2.3


From 0c62c6bf303652ec2783a4a6d62f0744dedbdf84 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Mon, 10 Jul 2023 16:33:22 +0200
Subject: Update maven-dependency-tree

---
 parent/pom.xml                    |  5 +++++
 vespa-enforcer-extensions/pom.xml | 27 +++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'parent/pom.xml')

diff --git a/parent/pom.xml b/parent/pom.xml
index 66909b227f4..e98a0686c23 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -840,6 +840,11 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <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>
diff --git a/vespa-enforcer-extensions/pom.xml b/vespa-enforcer-extensions/pom.xml
index fe1f2d1933b..4c006cb393f 100644
--- a/vespa-enforcer-extensions/pom.xml
+++ b/vespa-enforcer-extensions/pom.xml
@@ -15,15 +15,14 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.enforcer</groupId>
-            <artifactId>enforcer-api</artifactId>
-            <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>
@@ -49,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>
 
-- 
cgit v1.2.3