[java-idp-plugin-archetype] branch main updated: Change shib.groupId to shib-shared.groupId, and add other shared libs

Phil Smart philip.smart at jisc.ac.uk
Wed Oct 18 13:24:04 UTC 2023


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

philsmart pushed a commit to branch main
in repository java-idp-plugin-archetype.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-archetype.git;a=commit;h=cb8eeb0af7b83556afd6f6e4780200ac47316e4f

The following commit(s) were added to refs/heads/main by this push:
     new cb8eeb0  Change shib.groupId to shib-shared.groupId, and add other shared libs
cb8eeb0 is described below

commit cb8eeb0af7b83556afd6f6e4780200ac47316e4f
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Oct 18 14:23:57 2023 +0100

    Change shib.groupId to shib-shared.groupId, and add other shared libs
---
 .../archetype-resources/plugin-api/pom.xml         |  2 ++
 .../archetype-resources/plugin-impl/pom.xml        |  5 ++-
 src/main/resources/archetype-resources/pom.xml     | 42 ++++++++++++----------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/archetype-resources/plugin-api/pom.xml b/src/main/resources/archetype-resources/plugin-api/pom.xml
index 6eeafa4..c0708e2 100644
--- a/src/main/resources/archetype-resources/plugin-api/pom.xml
+++ b/src/main/resources/archetype-resources/plugin-api/pom.xml
@@ -28,6 +28,8 @@
             <artifactId>jsr305</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Test dependencies -->
     </dependencies>
     
 </project>
diff --git a/src/main/resources/archetype-resources/plugin-impl/pom.xml b/src/main/resources/archetype-resources/plugin-impl/pom.xml
index 086c892..f83a6ed 100644
--- a/src/main/resources/archetype-resources/plugin-impl/pom.xml
+++ b/src/main/resources/archetype-resources/plugin-impl/pom.xml
@@ -31,10 +31,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${shib.groupId}</groupId>
+            <groupId>${shib-shared.groupId}</groupId>
             <artifactId>shib-profile-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- Provided dependencies -->
+        
+        <!-- Test dependencies -->
     </dependencies>
 
     <build>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index a181065..3b089b7 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -21,11 +21,14 @@
         <idp.version>5.0.0-SNAPSHOT</idp.version>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
-        <shib.groupId>net.shibboleth</shib.groupId>
-        <shib-profile.version>5.0.0-SNAPSHOT</shib-profile.version>
-        <shib-attribute.version>5.0.0-SNAPSHOT</shib-attribute.version>
-        <shib-metadata.version>5.0.0-SNAPSHOT</shib-metadata.version>
-        <shib-shared.version>9.0.0-SNAPSHOT</shib-shared.version>
+        <shib-shared.groupId>net.shibboleth</shib-shared.groupId>
+        <shib-shared.version>9.0.0</shib-shared.version>
+        <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
+        <shib-profile.version>5.0.0</shib-profile.version>
+        <shib-attribute.groupId>net.shibboleth</shib-attribute.groupId>
+        <shib-attribute.version>5.0.0</shib-attribute.version>
+        <shib-metadata.groupId>net.shibboleth</shib-metadata.groupId>
+        <shib-metadata.version>5.0.0</shib-metadata.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
     </properties>
     
@@ -74,49 +77,52 @@
                 <artifactId>idp-plugin-${pluginBase}-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>     
-            <!-- BOMs for importing IdP dependencies -->       
+            <!-- Import Dependencies: Shib-Metadata/Attribute/Profile/Shared -->
             <dependency>
-                <groupId>${idp.groupId}</groupId>
-                <artifactId>idp-bom</artifactId>
-                <version>${idp.version}</version>
+                <groupId>${shib-shared.groupId}</groupId>
+                <artifactId>shib-shared-bom</artifactId>
+                <version>${shib-shared.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>${shib.groupId}</groupId>
+                <groupId>${shib-profile.groupId}</groupId>
                 <artifactId>shib-profile-bom</artifactId>
                 <version>${shib-profile.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>${shib.groupId}</groupId>
+                <groupId>${shib-attribute.groupId}</groupId>
                 <artifactId>shib-attribute-bom</artifactId>
                 <version>${shib-attribute.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>${shib.groupId}</groupId>
+                <groupId>${shib-metadata.groupId}</groupId>
                 <artifactId>shib-metadata-bom</artifactId>
                 <version>${shib-metadata.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Shibboleth IdP BOM for importing IdP dependencies -->
             <dependency>
-                <groupId>${opensaml.groupId}</groupId>
-                <artifactId>opensaml-bom</artifactId>
-                <version>${opensaml.version}</version>
+                <groupId>${idp.groupId}</groupId>
+                <artifactId>idp-bom</artifactId>
+                <version>${idp.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Opensaml BOM for importing opensaml dependencies -->
             <dependency>
-                <groupId>${shib.groupId}</groupId>
-                <artifactId>shib-shared-bom</artifactId>
-                <version>${shib-shared.version}</version>
+                <groupId>${opensaml.groupId}</groupId>
+                <artifactId>opensaml-bom</artifactId>
+                <version>${opensaml.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
     

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


More information about the commits mailing list