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

Polish Brussels Changes

Browse Source 
Issue gh-708
This commit is contained in:
Rob Winch
2017-01-13 12:29:34 -06:00
parent 5cbabfb719
commit ae2b3d8ed2
5 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -23,7 +23,6 @@ group = 'org.springframework.session'
ext.springBootVersion = '1.5.0.RC1' ext.springBootVersion = '1.5.0.RC1'
ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle" ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle" ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle" ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
ext.BOM_GRADLE = "$rootDir/gradle/bom.gradle" ext.BOM_GRADLE = "$rootDir/gradle/bom.gradle"
ext.SAMPLE_GRADLE = "$rootDir/gradle/sample.gradle" ext.SAMPLE_GRADLE = "$rootDir/gradle/sample.gradle"

6
gradle.properties
View File

@@ -5,11 +5,11 @@ jspApiVersion=2.0
servletApiVersion=3.0.1 servletApiVersion=3.0.1
jstlelVersion=1.2.5 jstlelVersion=1.2.5
version=1.4.0.BUILD-SNAPSHOT version=1.4.0.BUILD-SNAPSHOT
springDataRedisVersion=1.7.1.RELEASE springDataRedisVersion=1.8.0.RC1
html5ShivVersion=3.7.3 html5ShivVersion=3.7.3
commonsLoggingVersion=1.2 commonsLoggingVersion=1.2
junitVersion=4.12 junitVersion=4.12
lettuceVersion=3.5.0.Final lettuceVersion=4.3.0.Final
gebVersion=0.13.1 gebVersion=0.13.1
mockitoVersion=1.10.19 mockitoVersion=1.10.19
hazelcastVersion=3.6.5 hazelcastVersion=3.6.5
@@ -18,7 +18,7 @@ springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
springSecurityVersion=4.2.0.RELEASE springSecurityVersion=4.2.0.RELEASE
springVersion=4.3.4.RELEASE springVersion=4.3.4.RELEASE
httpClientVersion=4.5.1 httpClientVersion=4.5.1
jedisVersion=2.8.1 jedisVersion=2.9.0
h2Version=1.4.192 h2Version=1.4.192
springDataMongoVersion=1.9.4.RELEASE springDataMongoVersion=1.9.4.RELEASE
springShellVersion=1.1.0.RELEASE springShellVersion=1.1.0.RELEASE

24
gradle/spring3.gradle
View File

@@ -1,24 +0,0 @@
configurations {
spring3TestRuntime.extendsFrom testRuntime
}
configurations.spring3TestRuntime {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if (details.requested.group == 'org.springframework'
&& details.requested.name != 'spring-websocket'
&& details.requested.name != 'spring-messaging') {
details.useVersion '3.2.14.RELEASE'
}
}
}
task spring3Test(type: Test) {
jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring3TestRuntime
exclude "org/springframework/session/web/socket/**"
reports {
html.destination = project.file("$buildDir/spring3-test-results/")
junitXml.destination = project.file("$buildDir/reports/spring3-tests/")
}
}
check.dependsOn spring3Test

11
samples/websocket/src/test/java/sample/ApplicationTests.java
View File

@@ -26,9 +26,9 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.WebIntegrationTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFuture;
import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.TextMessage;
@@ -44,13 +44,12 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
* @author Rob Winch * @author Rob Winch
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(Application.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
@WebIntegrationTest(randomPort = true)
public class ApplicationTests { public class ApplicationTests {
@Rule @Rule
public final ExpectedException thrown = ExpectedException.none(); public final ExpectedException thrown = ExpectedException.none();
@Value("${local.server.port}") @LocalServerPort
String port; String port;
@Autowired @Autowired

1
spring-session/build.gradle
View File

@@ -1,5 +1,4 @@
apply from: JAVA_GRADLE apply from: JAVA_GRADLE
apply from: SPRING3_GRADLE
apply from: MAVEN_GRADLE apply from: MAVEN_GRADLE
apply plugin: 'spring-io' apply plugin: 'spring-io'