Merge pull request #45 from paypal/develop

Bringing in 2.2.1 changes to master

README.md

@@ -28,7 +28,7 @@ Add the Maven dependency below to your Spring Boot application pom file.<br>
 <dependency>
    <groupId>com.paypal.springboot</groupId>
    <artifactId>resteasy-spring-boot-starter</artifactId>
-   <version>2.2.0-RELEASE</version>
+   <version>2.2.1-RELEASE</version>
    <scope>runtime</scope>
 </dependency>
 ```

mds/RELEASE_NOTES.md

@@ -1,5 +1,21 @@
 # Release notes
 
+## 2.2.1-RELEASE
+
+#### Release date
+November 20th, 2016.
+
+#### Third-party versions
+- RESTEasy: 3.0.19.Final
+- Spring Boot: 1.4.2.RELEASE
+
+#### New features and enhancements
+1. [43 - Upgrade Spring Boot to version 1.4.2](https://github.com/paypal/resteasy-spring-boot/issues/43)
+1. [40 - Spring 4.1 is not supported although it easily can be](https://github.com/paypal/resteasy-spring-boot/issues/40)
+
+#### Bug fixes
+1. [42 - Remove deprecated code](https://github.com/paypal/resteasy-spring-boot/issues/42)
+
 ## 2.2.0-RELEASE
 
 #### Release date

mds/USAGE.md

@@ -7,7 +7,7 @@ Add the Maven dependency below to your Spring Boot application pom file.<br>
 <dependency>
    <groupId>com.paypal.springboot</groupId>
    <artifactId>resteasy-spring-boot-starter</artifactId>
-   <version>2.2.0-RELEASE</version>
+   <version>2.2.1-RELEASE</version>
    <scope>runtime</scope>
 </dependency>
 ```

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.paypal.springboot</groupId>
     <artifactId>resteasy-spring-boot-starter-parent</artifactId>
-    <version>2.2.0-RELEASE</version>
+    <version>2.2.1-RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

resteasy-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.paypal.springboot</groupId>
     <artifactId>resteasy-spring-boot-starter</artifactId>
-    <version>2.2.0-RELEASE</version>
+    <version>2.2.1-RELEASE</version>
     <name>${project.artifactId}</name>
 
     <description>A Spring Boot starter for RESTEasy</description>
@@ -42,7 +42,7 @@
     </distributionManagement>
 
     <properties>
-        <springboot.version>1.4.0.RELEASE</springboot.version>
+        <springboot.version>1.4.2.RELEASE</springboot.version>
         <resteasy.version>3.0.19.Final</resteasy.version>
         <coverage.line>80</coverage.line>
         <coverage.branch>80</coverage.branch>

resteasy-spring-boot-starter/src/main/java/com/paypal/springboot/resteasy/ResteasyApplicationBuilder.java

@@ -10,8 +10,7 @@
 import org.jboss.resteasy.plugins.servlet.ResteasyServletInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
-import org.springframework.stereotype.Component;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 
 /**
  * This class is the Spring Boot equivalent of {@link ResteasyServletInitializer},
@@ -34,7 +33,6 @@
  *
  * @author Fabio Carvalho ([email protected] or [email protected])
  */
-@Component(ResteasyApplicationBuilder.BEAN_NAME)
 public class ResteasyApplicationBuilder {
 
 	public static final String BEAN_NAME = "JaxrsApplicationServletBuilder";

resteasy-spring-boot-starter/src/main/java/com/paypal/springboot/resteasy/ResteasySpringBootConfig.java

@@ -17,7 +17,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -30,7 +29,6 @@
  * 
  */
 @Configuration
-@Import({ResteasyApplicationBuilder.class, ResteasyEmbeddedServletInitializer.class})
 @AutoConfigureAfter(WebMvcAutoConfiguration.class)
 @EnableConfigurationProperties
 public class ResteasySpringBootConfig {
@@ -97,5 +95,14 @@ public void contextDestroyed(ServletContextEvent sce) {
 
 		return servletContextListener;
 	}
-
+
+	@Bean(name = ResteasyApplicationBuilder.BEAN_NAME)
+	public ResteasyApplicationBuilder resteasyApplicationBuilder() {
+		return new ResteasyApplicationBuilder();
+	}
+
+	@Bean
+	public ResteasyEmbeddedServletInitializer resteasyEmbeddedServletInitializer() {
+		return new ResteasyEmbeddedServletInitializer();
+	}
 }

resteasy-spring-boot-starter/src/test/java/com/paypal/springboot/resteasy/ResteasyEmbeddedServletInitializerTest.java

@@ -1,7 +1,7 @@
 package com.paypal.springboot.resteasy;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;

sample-app/pom.xml

@@ -5,15 +5,15 @@
 
     <groupId>com.test</groupId>
     <artifactId>sample-app</artifactId>
-    <version>2.2.0-RELEASE</version>
+    <version>2.2.1-RELEASE</version>
     <packaging>jar</packaging>
 
     <description>Simple test application for the Resteasy Spring Boot starter</description>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>1.4.2.RELEASE</version>
         <relativePath/>
     </parent>
 

sample-app/src/main/java/com/test/Application.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 /**
  * SpringBoot entry point application