Support for Jetty 10 and 11, remove Jetty 6 (#62)

* Add Jetty 10 and 11 support * Remove Jetty 6 support * Bump versions
eclipse-jetty · Oct 14, 2022 · 0880058 · 0880058
1 parent 5df2712
commit 0880058
Show file tree

Hide file tree

Showing 76 changed files with 1,697 additions and 2,722 deletions.
diff --git a/features/eclipse-jetty/feature.xml b/features/eclipse-jetty/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.eclipsejetty.feature"
       label="Eclipse Jetty Feature"
-      version="5.0.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="Christian Köberl">
 
    <description url="http://eclipse-jetty.github.io/">
@@ -35,7 +35,7 @@ limitations under the License.
          id="net.sourceforge.eclipsejetty.launcher"
          download-size="25"
          install-size="25"
-         version="5.0.0.qualifier"
+         version="6.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/eclipse-jetty/pom.xml b/features/eclipse-jetty/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>net.sourceforge.eclipsejetty</groupId>
 		<artifactId>parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

diff --git a/plugins/eclipse-jetty-launcher/.settings/org.eclipse.jdt.core.prefs b/plugins/eclipse-jetty-launcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/eclipse-jetty-launcher/META-INF/MANIFEST.MF b/plugins/eclipse-jetty-launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Jetty Launcher Plugin
 Bundle-SymbolicName: net.sourceforge.eclipsejetty.launcher;singleton:=true
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: net.sourceforge.eclipsejetty.JettyPlugin
 Bundle-Vendor: Christian Köberl, Manfred Hantschel
 Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.filesystem;bundle-version="1.2.0",
  org.eclipse.m2e.core;bundle-version="1.0.0";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  jdi.jar,

diff --git a/plugins/eclipse-jetty-launcher/pom.xml b/plugins/eclipse-jetty-launcher/pom.xml
@@ -1,122 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>net.sourceforge.eclipsejetty</groupId>
-        <artifactId>parent</artifactId>
-        <version>5.0.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
-    </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>net.sourceforge.eclipsejetty</groupId>
+		<artifactId>parent</artifactId>
+		<version>6.0.0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
 
-    <artifactId>net.sourceforge.eclipsejetty.launcher</artifactId>
-    <packaging>eclipse-plugin</packaging>
+	<artifactId>net.sourceforge.eclipsejetty.launcher</artifactId>
+	<packaging>eclipse-plugin</packaging>
 
-    <name>Eclipse Jetty Launcher Plugin</name>
-    <description>Eclipse launch configuration for Jetty</description>
+	<name>Eclipse Jetty Launcher Plugin</name>
+	<description>Eclipse launch configuration for Jetty</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-embedded</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-jetty7</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-jetty6</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-jetty8</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-jetty7</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-jetty9</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-jetty8</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-jetty10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-jetty9</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-jetty11</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.eclipsejetty</groupId>
-            <artifactId>eclipse-jetty-starters-console</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-embedded</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>net.sourceforge.eclipsejetty</groupId>
+			<artifactId>eclipse-jetty-starters-console</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies-starters</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeArtifactIds>eclipse-jetty-starters-common,
-                                eclipse-jetty-starters-embedded,
-                                eclipse-jetty-starters-jetty6,
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies-starters</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeArtifactIds>eclipse-jetty-starters-common,
                                 eclipse-jetty-starters-jetty7,
                                 eclipse-jetty-starters-jetty8,
                                 eclipse-jetty-starters-jetty9,
+                                eclipse-jetty-starters-jetty10,
+                                eclipse-jetty-starters-jetty11,
                                 eclipse-jetty-starters-console,
                                 eclipse-jetty-starters-util</includeArtifactIds>
-                            <outputDirectory>${project.build.directory}/../lib</outputDirectory>
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                    </execution>
+							<outputDirectory>${project.build.directory}/../lib</outputDirectory>
+							<stripVersion>true</stripVersion>
+						</configuration>
+					</execution>
 
-                    <execution>
-                        <id>copy-dependencies-jetty</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.eclipse.jetty,
+					<execution>
+						<id>copy-dependencies-jetty</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeGroupIds>org.eclipse.jetty,
                                 org.eclipse.jetty.orbit,
                                 org.eclipse.jetty.toolchain,
                                 org.eclipse.jetty.websocket,
@@ -126,11 +122,11 @@
                                 javax.transaction,
                                 javax.websocket,
                                 org.ow2.asm</includeGroupIds>
-                            <outputDirectory>${project.build.directory}/../lib/jetty</outputDirectory>
-                            <stripVersion>true</stripVersion>
-                            <overWriteReleases>true</overWriteReleases>
-                        </configuration>
-                    </execution>
+							<outputDirectory>${project.build.directory}/../lib/jetty</outputDirectory>
+							<stripVersion>true</stripVersion>
+							<overWriteReleases>true</overWriteReleases>
+						</configuration>
+					</execution>
 
                     <execution>
                         <id>copy-dependencies-apache-jsp</id>
@@ -145,8 +141,8 @@
                             <overWriteReleases>true</overWriteReleases>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/...e-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyConfigBuilder.java b/...e-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyConfigBuilder.java
@@ -282,12 +282,13 @@ public JettyConfigBuilder beginRef(String id)
 
         switch (version)
         {
-            case JETTY_6:
             case JETTY_7:
             case JETTY_8:
                 builder.attribute("id", id);
                 break;
             case JETTY_9:
+            case JETTY_10:
+            case JETTY_11:
                 builder.attribute("refid", id);
                 break;
             default:

diff --git a/...eclipse-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyVersion.java b/...eclipse-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyVersion.java
@@ -316,9 +316,6 @@ private static JettyVersionType extractType(Integer majorVersion, Integer minorV
 
         switch (majorVersion.intValue())
         {
-            case 6:
-                return JettyVersionType.JETTY_6;
-
             case 7:
                 return JettyVersionType.JETTY_7;
 
@@ -340,6 +337,17 @@ else if (minorVersion.intValue() < 4)
                     return JettyVersionType.JETTY_9_4;
                 }
             }
+
+            case 10:
+            {
+            	return JettyVersionType.JETTY_10;
+            }
+
+            case 11:
+            {
+            	return JettyVersionType.JETTY_11;
+            }
+
             default:
                 return null;
         }