[java-idp-plugin-jetty] 172/186: JJETTY-13 Implement Jetty-base plugin V2

[Rod Widdowson]

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

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

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

commit af121d6cb2039b56b5f9cd2104014e99547e561e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 28 16:28:28 2025 +0100

    JJETTY-13 Implement Jetty-base plugin V2
    
    https://shibboleth.atlassian.net/browse/JJETTY-13
    
    Strip out all the jetty, procrun and logback version info
    
    Rationalize version (to 0.9.0-SNAPSHOT)
---
 jetty-dist/pom.xml |  2 +-
 jetty-impl/pom.xml | 23 ++---------------------
 pom.xml            | 15 +++------------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/jetty-dist/pom.xml b/jetty-dist/pom.xml
index 873ff00..55fce06 100644
--- a/jetty-dist/pom.xml
+++ b/jetty-dist/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth.idp.plugin.jetty</groupId>
         <artifactId>jetty-plugin-parent</artifactId>
-        <version>5.12019.0-SNAPSHOT</version>
+        <version>0.9.0-SNAPSHOT</version>
     </parent>
 
     <name>Jettty: Plugin and Module Distribution</name>
diff --git a/jetty-impl/pom.xml b/jetty-impl/pom.xml
index b4e66ff..99894bc 100644
--- a/jetty-impl/pom.xml
+++ b/jetty-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth.idp.plugin.jetty</groupId>
         <artifactId>jetty-plugin-parent</artifactId>
-        <version>5.12019.0-SNAPSHOT</version>
+        <version>0.9.0-SNAPSHOT</version>
     </parent>
 
     <name>Jettty: Plugin and Module implementation </name>
@@ -78,28 +78,10 @@
                     </archive>
                 </configuration>
             </plugin>
-	    <!-- Copy files to the jettey base we will create -->
+	    <!-- Copy (linux) files to the jetty base we will create (for use outside the plugin -->
 	    <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
-                    <!-- Copy Logback logging dependencies to jetty-base/lib/logging directory. -->
-                    <execution>
-                        <id>copy-jetty-logging-logback</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-			    <includeEmptyDirs>true</includeEmptyDirs>
-                            <outputDirectory>${assemblyDirectory}/lib/logging/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.basedir}/../jetty-base-packages/target/staging/logback</directory>
-				    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>copy-jetty-base</id>
                         <phase>prepare-package</phase>
@@ -133,7 +115,6 @@
                     <descriptors>
                         <descriptor>src/main/assembly/tgz.xml</descriptor>
                         <descriptor>src/main/assembly/zip.xml</descriptor>
-                        <!--  <descriptor>src/main/assembly/testbed.xml</descriptor> -->
                     </descriptors>
                     <finalName>shibboleth-idp-jetty-base-${project.version}</finalName>
                     <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/pom.xml b/pom.xml
index 794972d..ac94a93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
     <name>Jetty: Plugin Parent Project</name>
     <description>
         Parent project for building a Jetty plugin
-        which deploys jetty itself, procrun (on Windows) and
-        a appropriate jetty-base (as a module).
+        which deploys a appropriate jetty-base (as a module).
+	The module also has commands to dowbnload jetty and procrun (on windows)
     </description>
     <groupId>net.shibboleth.idp.plugin.jetty</groupId>
     <artifactId>jetty-plugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>5.12019.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
 
     <properties>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
@@ -29,15 +29,6 @@
         <shib-profile.groupId>net.shibboleth</shib-profile.groupId>
         <shib-profile.version>5.2.0-SNAPSHOT</shib-profile.version>
 
-        <logback.version>1.5.13</logback.version>
-
-        <procrun.groupId>commons-daemon</procrun.groupId>
-        <procrun.artifactId>commons-daemon</procrun.artifactId>
-        <procrun.version>1.3.4</procrun.version>
-        <procrun.classifier>bin-windows</procrun.classifier>
-
-        <jetty.version>12.0.19</jetty.version>
-
     </properties>
 
     <dependencies/>

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