You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/10/13 09:10:47 UTC
svn commit: r1812086 - in /jackrabbit/oak/trunk/oak-examples/standalone: ./
src/main/java/org/apache/jackrabbit/oak/standalone/
src/test/java/org/apache/jackrabbit/oak/standalone/
Author: chetanm
Date: Fri Oct 13 09:10:47 2017
New Revision: 1812086
URL: http://svn.apache.org/viewvc?rev=1812086&view=rev
Log:
OAK-6113 - update spring to 1.5.x release
Update to Spring 1.5.7 release
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java
jackrabbit/oak/trunk/oak-examples/standalone/src/test/java/org/apache/jackrabbit/oak/standalone/RepositoryBootIT.java
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1812086&r1=1812085&r2=1812086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Fri Oct 13 09:10:47 2017
@@ -38,7 +38,7 @@
<skip.deployment>true</skip.deployment>
<slf4j.version>1.7.21</slf4j.version>
<slf4j.api.version>1.7.21</slf4j.api.version>
- <spring.boot.version>1.3.8.RELEASE</spring.boot.version>
+ <spring.boot.version>1.5.7.RELEASE</spring.boot.version>
</properties>
<dependencyManagement>
@@ -74,6 +74,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
@@ -177,6 +182,11 @@
<artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.1.7</version>
+ </dependency>
<!-- Required for Felix WebConsole -->
<dependency>
@@ -290,6 +300,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.18.1</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.config.file>
Modified: jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java?rev=1812086&r1=1812085&r2=1812086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java Fri Oct 13 09:10:47 2017
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.server.remo
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
Modified: jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java?rev=1812086&r1=1812085&r2=1812086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/WebConsoleSupport.java Fri Oct 13 09:10:47 2017
@@ -35,8 +35,8 @@ import org.apache.jackrabbit.oak.run.osg
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.embedded.ServletListenerRegistrationBean;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Modified: jackrabbit/oak/trunk/oak-examples/standalone/src/test/java/org/apache/jackrabbit/oak/standalone/RepositoryBootIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/test/java/org/apache/jackrabbit/oak/standalone/RepositoryBootIT.java?rev=1812086&r1=1812085&r2=1812086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/src/test/java/org/apache/jackrabbit/oak/standalone/RepositoryBootIT.java (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/src/test/java/org/apache/jackrabbit/oak/standalone/RepositoryBootIT.java Fri Oct 13 09:10:47 2017
@@ -26,12 +26,14 @@ import javax.jcr.SimpleCredentials;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration({OakServer.class, TestConfig.class})
+@SpringBootTest
+@ContextConfiguration(classes = {OakServer.class, TestConfig.class})
@TestPropertySource(properties = {"repo.home=target/testrepo"})
public class RepositoryBootIT {