[java-idp-oidc] branch main updated: Improve packaging and Maven descriptions

Phil Smart philip.smart at jisc.ac.uk
Fri Feb 12 14:12:29 UTC 2021


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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  b12ed993  Improve packaging and Maven descriptions
b12ed993 is described below

commit b12ed99352855757011401300102036ab4ea338e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Feb 12 14:12:27 2021 +0000

    Improve packaging and Maven descriptions
---
 idp-oidc-extension-api/pom.xml          | 34 +++++++++++++++++----
 idp-oidc-extension-distribution/pom.xml | 52 ++++++++++++++++-----------------
 idp-oidc-extension-impl/pom.xml         | 30 +++++++++++++------
 pom.xml                                 | 22 +++++++++++---
 4 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/idp-oidc-extension-api/pom.xml b/idp-oidc-extension-api/pom.xml
index 0bb1ca4e..4ee4e6d8 100644
--- a/idp-oidc-extension-api/pom.xml
+++ b/idp-oidc-extension-api/pom.xml
@@ -11,6 +11,8 @@
     </parent>
     
     <artifactId>idp-plugin-oidc-op-api</artifactId>
+    <description>OpenID Connect Provider plugin API.</description>
+    <name>Shibboleth IdP :: Plugins :: OpenID Connect Provider API</name>
     <packaging>jar</packaging>
 
     <properties>
@@ -96,11 +98,33 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                         <manifestEntries>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
+                        <manifestSections>
+                            <manifestSection>
+                                <name>net/shibboleth/idp/plugin/oidc/op/</name>
+                                <manifestEntries>
+                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
+                                    <Implementation-Version>${project.version}</Implementation-Version>
+                                    <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+                                </manifestEntries>
+                            </manifestSection>
+                        </manifestSections>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-    <scm>
-        <connection>${shibboleth.scm.connection}java-idp-oidc</connection>
-        <developerConnection>${shibboleth.scm.developerConnection}java-idp-oidc</developerConnection>
-        <url>${shibboleth.scm.url}java-idp-oidc.git</url>
-    </scm>
 
 </project>
diff --git a/idp-oidc-extension-distribution/pom.xml b/idp-oidc-extension-distribution/pom.xml
index 9e2b7801..8c2069af 100644
--- a/idp-oidc-extension-distribution/pom.xml
+++ b/idp-oidc-extension-distribution/pom.xml
@@ -11,40 +11,40 @@
     </parent>
     
     <artifactId>idp-plugin-oidc-op-distribution</artifactId>
+    <name>Shibboleth IdP :: Plugins :: OpenID Connect Provider Distribution</name>
+    <description>OpenID Connect Provider plugin distribution.</description>
 
     <properties>
         <checkstyle.configLocation>${project.basedir}/../resources/checkstyle.xml</checkstyle.configLocation>
         <automatic.module.name>net.shibboleth.idp.plugin.oidc.op.distribution</automatic.module.name>
+        <dist.finalName>shibboleth-idp-plugin-oidc-op-${project.version}</dist.finalName>
     </properties>
 
     <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <tarLongFileMode>posix</tarLongFileMode>
-          <descriptors>
-              <descriptor>src/assembly/dep.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>create-archive</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    </build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-assembly-plugin</artifactId>
+	        <configuration>
+	          <tarLongFileMode>posix</tarLongFileMode>
+	          <descriptors>
+	              <descriptor>src/assembly/dep.xml</descriptor>
+	          </descriptors>
+	          <finalName>${dist.finalName}</finalName>    
+	          <appendAssemblyId>false</appendAssemblyId>                        
+	        </configuration>
+	        <executions>
+	          <execution>
+	            <id>create-archive</id>
+	            <phase>package</phase>
+	            <goals>
+	              <goal>single</goal>
+	            </goals>
+	          </execution>
+	        </executions>
+	      </plugin>
+	    </plugins>
+   </build>
 
-    <scm>
-        <connection>${shibboleth.scm.connection}java-idp-oidc</connection>
-        <developerConnection>${shibboleth.scm.developerConnection}java-idp-oidc</developerConnection>
-        <url>${shibboleth.scm.url}java-idp-oidc.git</url>
-    </scm>
 
 </project>
 
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 67e73c77..dc1b4611 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -10,6 +10,8 @@
     </parent>
     
     <artifactId>idp-plugin-oidc-op-impl</artifactId>
+    <description>OpenID Connect Provider plugin implementation.</description>
+    <name>Shibboleth IdP :: Plugins :: OpenID Connect Provider Implementation</name>
     <packaging>jar</packaging>
     
     <properties>
@@ -309,10 +311,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-	    <groupId>net.shibboleth.utilities</groupId>
-	    <artifactId>java-support</artifactId>
-	    <type>test-jar</type>
-	    <scope>test</scope>
+	       <groupId>net.shibboleth.utilities</groupId>
+	       <artifactId>java-support</artifactId>
+	       <type>test-jar</type>
+	       <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.shibboleth.idp.plugin.scripting</groupId>
@@ -374,6 +376,21 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
+                        <manifestSections>
+                            <manifestSection>
+                                <name>net/shibboleth/idp/plugin/oidc/op/</name>
+                                <manifestEntries>
+                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
+                                    <Implementation-Version>${project.version}</Implementation-Version>
+                                    <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
+                                </manifestEntries>
+                            </manifestSection>
+                        </manifestSections>
+                    </archive>
                     <excludes>
                         <exclude>conf/**</exclude>
                         <exclude>credentials/**</exclude>
@@ -383,10 +400,5 @@
         </plugins>
     </build>
 
-    <scm>
-        <connection>${shibboleth.scm.connection}java-idp-oidc</connection>
-        <developerConnection>${shibboleth.scm.developerConnection}java-idp-oidc</developerConnection>
-        <url>${shibboleth.scm.url}java-idp-oidc.git</url>
-    </scm>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 96b754a2..d5d3f6c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
     <groupId>net.shibboleth.oidc</groupId>
     <artifactId>idp-plugin-oidc-op-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
+    <name>Shibboleth IdP :: Plugins :: OpenID Connect Provider</name>
     <packaging>pom</packaging>
     <properties>
         <shib.idp.version>4.1.0-SNAPSHOT</shib.idp.version>
@@ -21,6 +22,18 @@
         <commons.io.version>2.6</commons.io.version>
         <checkstyle.configLocation>${project.basedir}/resources/checkstyle.xml</checkstyle.configLocation>
     </properties>
+    
+    <description>
+        OpenID Connect Provider plugin for the Shibboleth IdP.
+    </description>
+    
+    <distributionManagement>
+        <site>
+            <id>site</id>
+            <url>dav:${shibboleth.site.url}oidc-op/${project.artifactId}/${project.version}/</url>
+        </site>
+    </distributionManagement>
+    
     <repositories>
         <repository>
             <id>shib-release</id>
@@ -123,11 +136,12 @@
             </dependency>            
         </dependencies>
     </dependencyManagement>
-
+    
     <scm>
-        <connection>${shibboleth.scm.connection}java-idp-oidc</connection>
-        <developerConnection>${shibboleth.scm.developerConnection}java-idp-oidc</developerConnection>
-        <url>${shibboleth.scm.url}java-idp-oidc.git</url>
+        <connection>scm:git:https://git.shibboleth.net/git/java-idp-oidc</connection>
+        <developerConnection>scm:git:git at git.shibboleth.net:java-idp-oidc</developerConnection>
+        <url>https://git.shibboleth.net/view/?p=java-idp-oidc.git</url>
     </scm>
 
+
 </project>

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


More information about the commits mailing list