Browse Source

Upgrade to Reactor Bismuth SR7, Hibernate ORM 5.2.14, Common Annotations 1.3.2

pull/1709/head
Juergen Hoeller 8 years ago
parent
commit
33cd160861
  1. 3
      build.gradle
  2. 2
      spring-context-indexer/spring-context-indexer.gradle
  3. 2
      spring-context-support/spring-context-support.gradle
  4. 2
      spring-context/spring-context.gradle
  5. 2
      spring-orm/spring-orm.gradle
  6. 4
      spring-test/spring-test.gradle

3
build.gradle

@ -53,7 +53,7 @@ configure(allprojects) { project -> @@ -53,7 +53,7 @@ configure(allprojects) { project ->
ext.kotlinVersion = "1.2.21"
ext.log4jVersion = "2.10.0"
ext.nettyVersion = "4.1.22.Final"
ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT"
ext.reactorVersion = "Bismuth-SR7"
ext.rxjavaVersion = "1.3.6"
ext.rxjavaAdapterVersion = "1.2.1"
ext.rxjava2Version = "2.1.10"
@ -140,7 +140,6 @@ configure(allprojects) { project -> @@ -140,7 +140,6 @@ configure(allprojects) { project ->
repositories {
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/milestone" } // for AspectJ 1.9 beta
maven { url "https://repo.spring.io/snapshot" } // Bismuth snapshot
}
dependencies {

2
spring-context-indexer/spring-context-indexer.gradle

@ -3,6 +3,6 @@ description = "Spring Context Indexer" @@ -3,6 +3,6 @@ description = "Spring Context Indexer"
dependencies {
testCompile(project(":spring-context"))
testCompile("javax.inject:javax.inject:1")
testCompile("javax.annotation:javax.annotation-api:1.3.1")
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
}

2
spring-context-support/spring-context-support.gradle

@ -20,6 +20,6 @@ dependencies { @@ -20,6 +20,6 @@ dependencies {
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("javax.annotation:javax.annotation-api:1.3.1")
testRuntime("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("com.sun.mail:javax.mail:1.6.1")
}

2
spring-context/spring-context.gradle

@ -8,7 +8,7 @@ dependencies { @@ -8,7 +8,7 @@ dependencies {
compile(project(':spring-core'))
compile(project(":spring-expression"))
optional(project(":spring-instrument"))
optional("javax.annotation:javax.annotation-api:1.3.1")
optional("javax.annotation:javax.annotation-api:1.3.2")
optional("javax.ejb:javax.ejb-api:3.2")
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
optional("javax.inject:javax.inject:1")

2
spring-orm/spring-orm.gradle

@ -9,7 +9,7 @@ dependencies { @@ -9,7 +9,7 @@ dependencies {
optional(project(":spring-context"))
optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1")
optional("org.hibernate:hibernate-core:5.2.13.Final")
optional("org.hibernate:hibernate-core:5.2.14.Final")
optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

4
spring-test/spring-test.gradle

@ -64,7 +64,7 @@ dependencies { @@ -64,7 +64,7 @@ dependencies {
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.13.Final")
testCompile("org.hibernate:hibernate-core:5.2.14.Final")
testCompile("org.hibernate:hibernate-validator:6.0.7.Final")
// Enable use of the JUnitPlatform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
@ -86,7 +86,7 @@ dependencies { @@ -86,7 +86,7 @@ dependencies {
testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testRuntime("javax.annotation:javax.annotation-api:1.3.1")
testRuntime("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")

Loading…
Cancel
Save