[java-mvn-enforcer] 01/02: JMVN-37 JMVN-31 Chnage parent pomn to be java-parent

Rod Widdowson rdw at steadingsoftware.com
Sat Apr 30 10:35:15 UTC 2022


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-mvn-enforcer.

View the commit online:
http://git.shibboleth.net/view/?p=java-mvn-enforcer.git;a=commit;h=1fad92c031768e43e1ce8c27c75ede54fcc57511

commit 1fad92c031768e43e1ce8c27c75ede54fcc57511
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 30 11:32:00 2022 +0100

    JMVN-37 JMVN-31 Chnage parent pomn to be java-parent
    
    Clean up dependencies at the same time and add a warning about
    the version of the parent pom (it cannot be snapshot)
---
 pom.xml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index a230bc0..6d0d867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	<!-- Parented by the IdP because it borrows some functionality
-	     and dependency from the IdP, but this is not an IDP only plugin -->
-        <groupId>net.shibboleth.idp</groupId>
-        <artifactId>idp-parent</artifactId>
-        <version>4.1.5</version>
+        <groupId>net.shibboleth</groupId>
+        <artifactId>parent</artifactId>
+        <!-- NOTE that the parent project references this project so this must
+             always be a released version at the risk of hugely disruptive re-entrancy  -->
+        <version>11.3.2</version>
     </parent>
 
     <groupId>net.shibboleth.maven.enforcer.rules</groupId>
@@ -19,6 +19,8 @@
     <packaging>jar</packaging>
 
     <properties>
+        <java-support.version>8.3.1</java-support.version>
+        <spring-extensions.version>6.2.0</spring-extensions.version>
         <automatic.module.name>net.shibboleth.maven.enforcer.rules.dist</automatic.module.name>
     </properties>
 
@@ -39,11 +41,22 @@
         </repository>
     </repositories>
 
-    <dependencies>  
+    <dependencies>
+        <!-- Compile Dependencies -->
+
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <version>${java-support.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
+            <version>${spring-extensions.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-	        <version>${slf4j.version}</version>
         </dependency> 
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -61,14 +74,6 @@
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
          </dependency>
-        <dependency>
-             <groupId>net.shibboleth.utilities</groupId>
-             <artifactId>java-support</artifactId>
-         </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-        </dependency>    
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-core</artifactId>
@@ -78,7 +83,6 @@
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
-
         <dependency>
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-compress</artifactId>
@@ -98,11 +102,6 @@
             <version>${maven-enforcer-plugin.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-invoker</artifactId>
-            <version>3.1.0</version>
-        </dependency>
     </dependencies>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list