[java-idp-jetty-base] 01/02: JJETTY-13 Implement Jetty-base plugin V2
Rod Widdowson
rdw at steadingsoftware.com
Sat Jun 28 15:38:42 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/JJETTY-13
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=13ca660a926a677aac0cff1faa7074e0468c150f
commit 13ca660a926a677aac0cff1faa7074e0468c150f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 28 16:18:12 2025 +0100
JJETTY-13 Implement Jetty-base plugin V2
https://shibboleth.atlassian.net/browse/JJETTY-13
Remove all traces of packages
---
jetty-dist/src/main/assembly/plugin.xml | 17 +--
.../shibboleth/idp/plugin/jetty/plugin.properties | 11 --
jetty-packages/pom.xml | 129 ---------------------
jetty-packages/src/main/assembly/logback.xml | 15 ---
pom.xml | 1 -
5 files changed, 1 insertion(+), 172 deletions(-)
diff --git a/jetty-dist/src/main/assembly/plugin.xml b/jetty-dist/src/main/assembly/plugin.xml
index 8bad9be..d1e7adf 100644
--- a/jetty-dist/src/main/assembly/plugin.xml
+++ b/jetty-dist/src/main/assembly/plugin.xml
@@ -10,12 +10,7 @@
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>jetty-plugin-*.jar</include>
- </includes><!--
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>-->
+ </includes>
</fileSet>
<fileSet>
<!-- The signing keys -->
@@ -33,16 +28,6 @@
<include>plugin.properties</include>
</includes>
</fileSet>
- <fileSet>
- <!-- The packages -->
- <directory>../jetty-packages/target/packages</directory>
- <outputDirectory>packages</outputDirectory>
- <includes>
- <include>logback.tar.gz</include>
- <include>jetty-home.tar.gz</include>
- <include>procrun.zip</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
index 18d7934..0586e55 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/plugin/jetty/plugin.properties
@@ -5,16 +5,5 @@ plugin.id = net.shibboleth.idp.plugin.jetty
plugin.version = 5.12018.0
plugin.license =
-plugin.package.1.source=packages/jetty-home.tar.gz
-plugin.package.1.destination=jetty-home
-
-plugin.package.2.source=packages/logback.tar.gz
-plugin.package.2.destination=jetty-base/lib/logging
-
-plugin.package.3.source=packages/procrun.zip
-plugin.package.3.destination=shibd_idp
-plugin.package.3.stripTopLevelDir=false
-plugin.package.3.nonwindows=false
-
# No prereqs
#plugin.modules.required =
\ No newline at end of file
diff --git a/jetty-packages/pom.xml b/jetty-packages/pom.xml
deleted file mode 100644
index 37c242a..0000000
--- a/jetty-packages/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth.idp.plugin.jetty</groupId>
- <artifactId>jetty-plugin-parent</artifactId>
- <version>5.12019.0-SNAPSHOT</version>
- </parent>
-
- <name>Jettty: Collect the packages </name>
- <description>
- Project which does the maven work to colect the packages to
- bundle into the jetty-base tarball/zipfile and Jetty Plugin.
- </description>
- <artifactId>jetty-plugin-packages</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <packageDir>${project.build.directory}/packages</packageDir>
- <stagingDir>${project.build.directory}/staging</stagingDir>
- </properties>
-
- <dependencies/>
-
- <build>
- <!-- So, the build is quite complex:
- The impl project builds the jar file
- This project builds three packages
- process-resources - download the logback jars to a staging area
- - download jetty and procmon to a staging area
- prepare-package - rename jetty and procrun to their "package from" destination
- package - package the logback jars into a zip file and put into the package from" destination
- The dist prioject builds the plugin.
- -->
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>download-jetty-procrun-logback</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <!-- Copy Logback logging staging/logback. -->
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <outputDirectory>${stagingDir}/logback</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- <outputDirectory>${stagingDir}/logback</outputDirectory>
- </artifactItem>
- <!-- Copy Jetty and procrun to staging. -->
- <artifactItem>
- <groupId>${procrun.groupId}</groupId>
- <artifactId>${procrun.artifactId}</artifactId>
- <version>${procrun.version}</version>
- <classifier>${procrun.classifier}</classifier>
- <type>zip</type>
- <outputDirectory>${stagingDir}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>${jetty.groupId}</groupId>
- <artifactId>jetty-home</artifactId>
- <version>${jetty.version}</version>
- <type>tar.gz</type>
- <outputDirectory>${stagingDir}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <!-- give jetty and procrun non changing names -->
- <execution>
- <id>change-jetty-procrun-name</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy file="${stagingDir}/jetty-home-${jetty.version}.tar.gz" tofile="${packageDir}/jetty-home.tar.gz"/>
- <copy file="${stagingDir}/${procrun.artifactId}-${procrun.version}-${procrun.classifier}.zip" tofile="${packageDir}/procrun.zip"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/logback.xml</descriptor>
- </descriptors>
- <archiveBaseDirectory>${stagingDir}/logback</archiveBaseDirectory>
- <outputDirectory>${packageDir}</outputDirectory>
- <finalName>logback</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/jetty-packages/src/main/assembly/logback.xml b/jetty-packages/src/main/assembly/logback.xml
deleted file mode 100644
index 1cc79aa..0000000
--- a/jetty-packages/src/main/assembly/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<assembly>
- <id>logback</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/pom.xml b/pom.xml
index 35267c0..794972d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
</dependencyManagement>
<modules>
- <module>jetty-packages</module>
<module>jetty-impl</module>
<module>jetty-dist</module>
</modules>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list