Skip to content

Commit

Permalink
Introduced EE11 and jetty-12.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregw
gregw committed Apr 26, 2024
1 parent 151fffb commit b11996a
Show file tree
Hide file tree
Showing 2,456 changed files with 249,433 additions and 655 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/issue-template.md
View file
Expand Up @@ -11,7 +11,7 @@ labels: Bug
<!--[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958) -->

**Jetty Environment**
<!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10 -->
<!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10, ee11 -->

**Java version/vendor** `(use: java -version)`

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question-template.md
View file
Expand Up @@ -10,7 +10,7 @@ assignees: ''
**Jetty Version**

**Jetty Environment**
<!-- Applicable only for jetty-12, choose: core, ee8, ee9, ee10 -->
<!-- Applicable only for jetty-12, choose: core, ee8, ee9, ee10, ee11 -->

**Java Version**

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Expand Up @@ -11,7 +11,7 @@ Jetty is a modern fully asynchronous web server that has a long history as a com

```shell
$ mkdir jetty-base && cd jetty-base
$ java -jar $JETTY_HOME/start.jar --add-modules=http,ee10-deploy
$ java -jar $JETTY_HOME/start.jar --add-modules=http,ee11-deploy
$ cp ~/src/myproj/target/mywebapp.war webapps
$ java -jar $JETTY_HOME/start.jar
```
Expand All @@ -20,7 +20,7 @@ $ java -jar $JETTY_HOME/start.jar

```shell
$ mkdir jetty-base && cd jetty-base
$ java -jar $JETTY_HOME/start.jar --add-modules=http,ee10-deploy,ee8-deploy
$ java -jar $JETTY_HOME/start.jar --add-modules=http,ee11-deploy,ee8-deploy
$ cp ~/src/myproj/target/mywebapp10.war webapps
$ cp ~/src/myproj/target/mywebapp8.war webapps
$ echo "environment: ee8" > webapps/mywebapp8.properties
Expand Down
2 changes: 1 addition & 1 deletion build/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.build</groupId>
<artifactId>build</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions build/scripts/dependency-update-reports.sh
View file
Expand Up @@ -24,6 +24,11 @@ mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false
cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-core.html
popd

pushd jetty-ee11
mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false
cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee11.html
popd

pushd jetty-ee10
mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false
cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee10.html
Expand Down
4 changes: 4 additions & 0 deletions build/scripts/dependency-update.sh
View file
Expand Up @@ -11,6 +11,10 @@ pushd jetty-core
mvn -N -B -Pupdate-dependencies-core validate -Dmaven.build.cache.enabled=false
popd

pushd jetty-ee11
mvn -N -B -Pupdate-dependencies-ee11 validate -Dmaven.build.cache.enabled=false
popd

pushd jetty-ee10
mvn -N -B -Pupdate-dependencies-ee10 validate -Dmaven.build.cache.enabled=false
popd
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty-asciidoctor-extensions/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-asciidoctor-extensions</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion documentation/jetty-documentation/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-documentation</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
Expand Down
92 changes: 46 additions & 46 deletions javadoc/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>javadoc</artifactId>
<packaging>jar</packaging>
Expand All @@ -24,8 +24,8 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-bom</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down Expand Up @@ -163,110 +163,110 @@
<scope>provided</scope>
</dependency>

<!-- Jetty EE 10 Dependencies -->
<!-- Jetty EE 11 Dependencies -->
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-apache-jsp</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-apache-jsp</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-cdi</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-cdi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-fcgi-proxy</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-fcgi-proxy</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-glassfish-jstl</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-glassfish-jstl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jaspi</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-jaspi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jndi</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-jndi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-plus</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-proxy</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-proxy</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-quickstart</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-quickstart</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-runner</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-runner</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlets</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlets</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-webapp</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-alpn</artifactId>
<groupId>org.eclipse.jetty.ee11.osgi</groupId>
<artifactId>jetty-ee11-osgi-alpn</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot</artifactId>
<groupId>org.eclipse.jetty.ee11.osgi</groupId>
<artifactId>jetty-ee11-osgi-boot</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot-jsp</artifactId>
<groupId>org.eclipse.jetty.ee11.osgi</groupId>
<artifactId>jetty-ee11-osgi-boot-jsp</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-client</artifactId>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jakarta-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jakarta-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jetty-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-servlet</artifactId>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-client</artifactId>
<name>Core :: ALPN :: Client</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-conscrypt-client</artifactId>
<name>Core :: ALPN :: Conscrypt Client</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<name>Core :: ALPN :: Conscrypt Server</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-java-client</artifactId>
<name>Core :: ALPN :: Java Client</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-java-server</artifactId>
<name>Core :: ALPN :: Java Server</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-server</artifactId>
<name>Core :: ALPN :: Server</name>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-alpn/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.9-SNAPSHOT</version>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn</artifactId>
<packaging>pom</packaging>
Expand Down

0 comments on commit b11996a

Please sign in to comment.