[java-idp-plugin-jetty] 01/02: JJETTY-14 Complete move to separate Repository
Rod Widdowson
rdw at steadingsoftware.com
Mon Aug 4 13:19:38 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-jetty.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=1ead75cc584b1ee912283d31fc76d2e7d25d91d2
commit 1ead75cc584b1ee912283d31fc76d2e7d25d91d2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Aug 4 11:10:59 2025 +0100
JJETTY-14 Complete move to separate Repository
https://shibboleth.atlassian.net/browse/JJETTY-13
Teach the impl pom how to collect jetty-base from maven.
(in a way which supports multiple versions).
Remove all the legacy jetty base assembly stuff from jetty-impl
---
jetty-impl/pom.xml | 101 ++++++++++++++++++++++++++---------------------------
1 file changed, 50 insertions(+), 51 deletions(-)
diff --git a/jetty-impl/pom.xml b/jetty-impl/pom.xml
index 3297c96..4483f00 100644
--- a/jetty-impl/pom.xml
+++ b/jetty-impl/pom.xml
@@ -23,7 +23,6 @@
<assemblyDirectory>${project.build.directory}/jetty-base</assemblyDirectory>
</properties>
-
<dependencies>
<!-- Provided Dependencies needed to build the plugin and module -->
<dependency>
@@ -56,83 +55,83 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
<plugin>
+ <!-- Unpack jetty-base into our classes tree -->
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <!-- Copy CLI jar into the target, giving it a non changing name -->
+ <id>unpack-jettybase</id>
<phase>prepare-package</phase>
<goals>
- <goal>run</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
- <target>
- <copy
- file="${project.basedir}/../jetty-cli/target/jetty-plugin-cli-${project.version}.jar"
- tofile="${project.build.outputDirectory}/net/shibboleth/idp/module/jetty/jetty-cli.jar"/>
- </target>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-jetty-base</artifactId>
+ <type>jar</type>
+ <version>12.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
+ <overWrite>true</overWrite>
+ <!-- We only want the net/shibboleth/idp/.... bit and NOT META-INF -->
+ <includes>**/shibboleth/**</includes>
+ <fileMappers>
+ <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ <pattern>jetty-base</pattern>
+ <replacement>jetty-base-12</replacement>
+ </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ </fileMappers>
+ </artifactItem>
+ <!-- How to do a different jetty-base version
+ <artifactItem>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-jetty-base</artifactId>
+ <type>jar</type>
+ <version>11.0.0</version>
+ <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
+ <overWrite>true</overWrite>
+ <includes>**/shibboleth/**</includes>
+ <fileMappers>
+ <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ <pattern>jetty-base</pattern>
+ <replacement>jetty-base-11</replacement>
+ </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+ </fileMappers>
+ </artifactItem>
+ -->
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <!-- Copy (linux) files to the jetty base we will create (for use outside the plugin -->
+
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
- <id>copy-jetty-base</id>
+ <!-- Copy CLI jar into the target, giving it a non changing name -->
<phase>prepare-package</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- <outputDirectory>${assemblyDirectory}</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <target>
+ <copy
+ file="${project.basedir}/../jetty-cli/target/jetty-plugin-cli-${project.version}.jar"
+ tofile="${project.build.outputDirectory}/net/shibboleth/idp/module/jetty/jetty-cli.jar"/>
+ </target>
</configuration>
</execution>
</executions>
</plugin>
-
-
- <!-- Assemble the artifacts. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/tgz.xml</descriptor>
- <descriptor>src/main/assembly/zip.xml</descriptor>
- </descriptors>
- <finalName>shibboleth-idp-jetty-base-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list