Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change default version of Jetty to 9.3

Browse Source 
Closes gh-5825
This commit is contained in:
Andy Wilkinson
2016-06-14 17:20:13 +01:00
parent e1cafb16ba
commit ff602e60a0
13 changed files with 113 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/README.adoc
View File

@@ -117,8 +117,8 @@ The following sample applications are provided:
| link:spring-boot-sample-jetty8-ssl[spring-boot-sample-jetty8-ssl]
| Embedded Jetty 8 SSL
| link:spring-boot-sample-jetty93[spring-boot-sample-jetty93]
| Embedded Jetty 9.3
| link:spring-boot-sample-jetty92[spring-boot-sample-jetty92]
| Embedded Jetty 9.2
| link:spring-boot-sample-jooq[spring-boot-sample-jooq]
| Stores data using jOOQ

2
spring-boot-samples/pom.xml
View File

@@ -58,7 +58,7 @@
<module>spring-boot-sample-jetty-ssl</module>
<module>spring-boot-sample-jetty8</module>
<module>spring-boot-sample-jetty8-ssl</module>
<module>spring-boot-sample-jetty93</module>
<module>spring-boot-sample-jetty92</module>
<module>spring-boot-sample-jooq</module>
<module>spring-boot-sample-jpa</module>
<module>spring-boot-sample-jta-atomikos</module>

8
spring-boot-samples/spring-boot-sample-jetty93/pom.xml → spring-boot-samples/spring-boot-sample-jetty92/pom.xml
View File

@@ -7,9 +7,9 @@
<artifactId>spring-boot-samples</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-sample-jetty93</artifactId>
<name>Spring Boot Jetty 9.3 Sample</name>
<description>Spring Boot Jetty 9.3 Sample</description>
<artifactId>spring-boot-sample-jetty92</artifactId>
<name>Spring Boot Jetty 9.2 Sample</name>
<description>Spring Boot Jetty 9.2 Sample</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
@@ -17,7 +17,7 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<jetty.version>9.3.0.v20150612</jetty.version>
<jetty.version>9.2.17.v20160517</jetty.version>
</properties>
<dependencies>
<dependency>

8
spring-boot-samples/spring-boot-sample-jetty93/src/main/java/sample/jetty93/SampleJetty93Application.java → spring-boot-samples/spring-boot-sample-jetty92/src/main/java/sample/jetty92/SampleJetty92Application.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* limitations under the License.
*/
package sample.jetty93;
package sample.jetty92;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class SampleJetty93Application {
public class SampleJetty92Application {
public static void main(String[] args) throws Exception {
SpringApplication.run(SampleJetty93Application.class, args);
SpringApplication.run(SampleJetty92Application.class, args);
}
}

4
spring-boot-samples/spring-boot-sample-jetty93/src/main/java/sample/jetty93/service/HelloWorldService.java → spring-boot-samples/spring-boot-sample-jetty92/src/main/java/sample/jetty92/service/HelloWorldService.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package sample.jetty93.service;
package sample.jetty92.service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

4
spring-boot-samples/spring-boot-sample-jetty93/src/main/java/sample/jetty93/web/SampleController.java → spring-boot-samples/spring-boot-sample-jetty92/src/main/java/sample/jetty92/web/SampleController.java
View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package sample.jetty93.web;
package sample.jetty92.web;
import sample.jetty93.service.HelloWorldService;
import sample.jetty92.service.HelloWorldService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;

2
spring-boot-samples/spring-boot-sample-jetty92/src/main/resources/application.properties Normal file
View File

@@ -0,0 +1,2 @@
server.compression.enabled: true
server.compression.min-response-size: 1

4
spring-boot-samples/spring-boot-sample-jetty93/src/test/java/sample/jetty93/SampleJetty93ApplicationTests.java → spring-boot-samples/spring-boot-sample-jetty92/src/test/java/sample/jetty92/SampleJetty92ApplicationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package sample.jetty93;
package sample.jetty92;
import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
public class SampleJetty93ApplicationTests {
public class SampleJetty92ApplicationTests {
@LocalServerPort
private int port;

2
spring-boot-samples/spring-boot-sample-jetty93/src/main/resources/application.properties
View File

@@ -1,2 +0,0 @@
server.compression.enabled: true
server.compression.min-response-size: 1