Skip to content

Commit 0880058

Browse files
derkoederkoe
authored
Support for Jetty 10 and 11, remove Jetty 6 (#62)
* Add Jetty 10 and 11 support * Remove Jetty 6 support * Bump versions
1 parent 5df2712 commit 0880058

File tree

76 files changed

+1697
-2722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1697
-2722
lines changed

‎features/eclipse-jetty/feature.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="net.sourceforge.eclipsejetty.feature"
44
label="Eclipse Jetty Feature"
5-
version="5.0.0.qualifier"
5+
version="6.0.0.qualifier"
66
provider-name="Christian Köberl">
77

88
<description url="http://eclipse-jetty.github.io/">
@@ -35,7 +35,7 @@ limitations under the License.
3535
id="net.sourceforge.eclipsejetty.launcher"
3636
download-size="25"
3737
install-size="25"
38-
version="5.0.0.qualifier"
38+
version="6.0.0.qualifier"
3939
unpack="false"/>
4040

4141
</feature>

‎features/eclipse-jetty/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>net.sourceforge.eclipsejetty</groupId>
1010
<artifactId>parent</artifactId>
11-
<version>5.0.0-SNAPSHOT</version>
11+
<version>6.0.0-SNAPSHOT</version>
1212
<relativePath>../..</relativePath>
1313
</parent>
1414

‎plugins/eclipse-jetty-launcher/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4-
org.eclipse.jdt.core.compiler.compliance=1.5
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.5
7+
org.eclipse.jdt.core.compiler.release=disabled
8+
org.eclipse.jdt.core.compiler.source=1.8

‎plugins/eclipse-jetty-launcher/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Eclipse Jetty Launcher Plugin
44
Bundle-SymbolicName: net.sourceforge.eclipsejetty.launcher;singleton:=true
5-
Bundle-Version: 5.0.0.qualifier
5+
Bundle-Version: 6.0.0.qualifier
66
Bundle-Activator: net.sourceforge.eclipsejetty.JettyPlugin
77
Bundle-Vendor: Christian Köberl, Manfred Hantschel
88
Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
1717
org.eclipse.core.filesystem;bundle-version="1.2.0",
1818
org.eclipse.m2e.core;bundle-version="1.0.0";resolution:=optional,
1919
org.eclipse.core.expressions;bundle-version="3.4.0"
20-
Bundle-RequiredExecutionEnvironment: J2SE-1.5
20+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2121
Bundle-ActivationPolicy: lazy
2222
Bundle-ClassPath: .,
2323
jdi.jar,

‎plugins/eclipse-jetty-launcher/pom.xml‎

Lines changed: 107 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,118 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<groupId>net.sourceforge.eclipsejetty</groupId>
8-
<artifactId>parent</artifactId>
9-
<version>5.0.0-SNAPSHOT</version>
10-
<relativePath>../..</relativePath>
11-
</parent>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>net.sourceforge.eclipsejetty</groupId>
6+
<artifactId>parent</artifactId>
7+
<version>6.0.0-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
1210

13-
<artifactId>net.sourceforge.eclipsejetty.launcher</artifactId>
14-
<packaging>eclipse-plugin</packaging>
11+
<artifactId>net.sourceforge.eclipsejetty.launcher</artifactId>
12+
<packaging>eclipse-plugin</packaging>
1513

16-
<name>Eclipse Jetty Launcher Plugin</name>
17-
<description>Eclipse launch configuration for Jetty</description>
14+
<name>Eclipse Jetty Launcher Plugin</name>
15+
<description>Eclipse launch configuration for Jetty</description>
1816

19-
<dependencies>
20-
<dependency>
21-
<groupId>net.sourceforge.eclipsejetty</groupId>
22-
<artifactId>eclipse-jetty-starters-embedded</artifactId>
23-
<version>${project.version}</version>
24-
<scope>provided</scope>
25-
</dependency>
17+
<dependencies>
18+
<dependency>
19+
<groupId>net.sourceforge.eclipsejetty</groupId>
20+
<artifactId>eclipse-jetty-starters-jetty7</artifactId>
21+
<version>${project.version}</version>
22+
<scope>provided</scope>
23+
</dependency>
2624

27-
<dependency>
28-
<groupId>net.sourceforge.eclipsejetty</groupId>
29-
<artifactId>eclipse-jetty-starters-jetty6</artifactId>
30-
<version>${project.version}</version>
31-
<scope>provided</scope>
32-
</dependency>
25+
<dependency>
26+
<groupId>net.sourceforge.eclipsejetty</groupId>
27+
<artifactId>eclipse-jetty-starters-jetty8</artifactId>
28+
<version>${project.version}</version>
29+
<scope>provided</scope>
30+
</dependency>
3331

34-
<dependency>
35-
<groupId>net.sourceforge.eclipsejetty</groupId>
36-
<artifactId>eclipse-jetty-starters-jetty7</artifactId>
37-
<version>${project.version}</version>
38-
<scope>provided</scope>
39-
</dependency>
32+
<dependency>
33+
<groupId>net.sourceforge.eclipsejetty</groupId>
34+
<artifactId>eclipse-jetty-starters-jetty9</artifactId>
35+
<version>${project.version}</version>
36+
<scope>provided</scope>
37+
</dependency>
4038

41-
<dependency>
42-
<groupId>net.sourceforge.eclipsejetty</groupId>
43-
<artifactId>eclipse-jetty-starters-jetty8</artifactId>
44-
<version>${project.version}</version>
45-
<scope>provided</scope>
46-
</dependency>
39+
<dependency>
40+
<groupId>net.sourceforge.eclipsejetty</groupId>
41+
<artifactId>eclipse-jetty-starters-jetty10</artifactId>
42+
<version>${project.version}</version>
43+
<scope>provided</scope>
44+
</dependency>
4745

48-
<dependency>
49-
<groupId>net.sourceforge.eclipsejetty</groupId>
50-
<artifactId>eclipse-jetty-starters-jetty9</artifactId>
51-
<version>${project.version}</version>
52-
<scope>provided</scope>
53-
</dependency>
46+
<dependency>
47+
<groupId>net.sourceforge.eclipsejetty</groupId>
48+
<artifactId>eclipse-jetty-starters-jetty11</artifactId>
49+
<version>${project.version}</version>
50+
<scope>provided</scope>
51+
</dependency>
5452

55-
<dependency>
56-
<groupId>net.sourceforge.eclipsejetty</groupId>
57-
<artifactId>eclipse-jetty-starters-console</artifactId>
58-
<version>${project.version}</version>
59-
<scope>provided</scope>
60-
<optional>true</optional>
61-
</dependency>
53+
<dependency>
54+
<groupId>net.sourceforge.eclipsejetty</groupId>
55+
<artifactId>eclipse-jetty-starters-embedded</artifactId>
56+
<version>${project.version}</version>
57+
<scope>provided</scope>
58+
</dependency>
6259

63-
<dependency>
64-
<groupId>junit</groupId>
65-
<artifactId>junit</artifactId>
66-
<version>4.13.1</version>
67-
<scope>test</scope>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.mockito</groupId>
71-
<artifactId>mockito-all</artifactId>
72-
<version>1.9.5</version>
73-
<scope>test</scope>
74-
</dependency>
75-
</dependencies>
60+
<dependency>
61+
<groupId>net.sourceforge.eclipsejetty</groupId>
62+
<artifactId>eclipse-jetty-starters-console</artifactId>
63+
<version>${project.version}</version>
64+
<scope>provided</scope>
65+
<optional>true</optional>
66+
</dependency>
7667

77-
<build>
78-
<plugins>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-compiler-plugin</artifactId>
82-
<configuration>
83-
<source>1.6</source>
84-
<target>1.6</target>
85-
</configuration>
86-
</plugin>
68+
<dependency>
69+
<groupId>junit</groupId>
70+
<artifactId>junit</artifactId>
71+
<version>4.13.1</version>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.mockito</groupId>
76+
<artifactId>mockito-all</artifactId>
77+
<version>1.9.5</version>
78+
<scope>test</scope>
79+
</dependency>
80+
</dependencies>
8781

88-
<plugin>
89-
<artifactId>maven-dependency-plugin</artifactId>
90-
<version>2.4</version>
91-
<executions>
92-
<execution>
93-
<id>copy-dependencies-starters</id>
94-
<phase>prepare-package</phase>
95-
<goals>
96-
<goal>copy-dependencies</goal>
97-
</goals>
98-
<configuration>
99-
<includeArtifactIds>eclipse-jetty-starters-common,
100-
eclipse-jetty-starters-embedded,
101-
eclipse-jetty-starters-jetty6,
82+
<build>
83+
<plugins>
84+
<plugin>
85+
<artifactId>maven-dependency-plugin</artifactId>
86+
<version>3.3.0</version>
87+
<executions>
88+
<execution>
89+
<id>copy-dependencies-starters</id>
90+
<phase>prepare-package</phase>
91+
<goals>
92+
<goal>copy-dependencies</goal>
93+
</goals>
94+
<configuration>
95+
<includeArtifactIds>eclipse-jetty-starters-common,
10296
eclipse-jetty-starters-jetty7,
10397
eclipse-jetty-starters-jetty8,
10498
eclipse-jetty-starters-jetty9,
99+
eclipse-jetty-starters-jetty10,
100+
eclipse-jetty-starters-jetty11,
105101
eclipse-jetty-starters-console,
106102
eclipse-jetty-starters-util</includeArtifactIds>
107-
<outputDirectory>${project.build.directory}/../lib</outputDirectory>
108-
<stripVersion>true</stripVersion>
109-
</configuration>
110-
</execution>
103+
<outputDirectory>${project.build.directory}/../lib</outputDirectory>
104+
<stripVersion>true</stripVersion>
105+
</configuration>
106+
</execution>
111107

112-
<execution>
113-
<id>copy-dependencies-jetty</id>
114-
<phase>prepare-package</phase>
115-
<goals>
116-
<goal>copy-dependencies</goal>
117-
</goals>
118-
<configuration>
119-
<includeGroupIds>org.eclipse.jetty,
108+
<execution>
109+
<id>copy-dependencies-jetty</id>
110+
<phase>prepare-package</phase>
111+
<goals>
112+
<goal>copy-dependencies</goal>
113+
</goals>
114+
<configuration>
115+
<includeGroupIds>org.eclipse.jetty,
120116
org.eclipse.jetty.orbit,
121117
org.eclipse.jetty.toolchain,
122118
org.eclipse.jetty.websocket,
@@ -126,11 +122,11 @@
126122
javax.transaction,
127123
javax.websocket,
128124
org.ow2.asm</includeGroupIds>
129-
<outputDirectory>${project.build.directory}/../lib/jetty</outputDirectory>
130-
<stripVersion>true</stripVersion>
131-
<overWriteReleases>true</overWriteReleases>
132-
</configuration>
133-
</execution>
125+
<outputDirectory>${project.build.directory}/../lib/jetty</outputDirectory>
126+
<stripVersion>true</stripVersion>
127+
<overWriteReleases>true</overWriteReleases>
128+
</configuration>
129+
</execution>
134130

135131
<execution>
136132
<id>copy-dependencies-apache-jsp</id>
@@ -145,8 +141,8 @@
145141
<overWriteReleases>true</overWriteReleases>
146142
</configuration>
147143
</execution>
148-
</executions>
149-
</plugin>
150-
</plugins>
151-
</build>
152-
</project>
144+
</executions>
145+
</plugin>
146+
</plugins>
147+
</build>
148+
</project>

‎plugins/eclipse-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyConfigBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,13 @@ public JettyConfigBuilder beginRef(String id)
282282

283283
switch (version)
284284
{
285-
case JETTY_6:
286285
case JETTY_7:
287286
case JETTY_8:
288287
builder.attribute("id", id);
289288
break;
290289
case JETTY_9:
290+
case JETTY_10:
291+
case JETTY_11:
291292
builder.attribute("refid", id);
292293
break;
293294
default:

‎plugins/eclipse-jetty-launcher/src/main/java/net/sourceforge/eclipsejetty/jetty/JettyVersion.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,6 @@ private static JettyVersionType extractType(Integer majorVersion, Integer minorV
316316

317317
switch (majorVersion.intValue())
318318
{
319-
case 6:
320-
return JettyVersionType.JETTY_6;
321-
322319
case 7:
323320
return JettyVersionType.JETTY_7;
324321

@@ -340,6 +337,17 @@ else if (minorVersion.intValue() < 4)
340337
return JettyVersionType.JETTY_9_4;
341338
}
342339
}
340+
341+
case 10:
342+
{
343+
return JettyVersionType.JETTY_10;
344+
}
345+
346+
case 11:
347+
{
348+
return JettyVersionType.JETTY_11;
349+
}
350+
343351
default:
344352
return null;
345353
}

0 commit comments

Comments
 (0)