You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/03 12:21:12 UTC
[isis] branch v2 updated: ISIS-2158: bump to next Spring version ->
2.2.0.RELEASE
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 35496ed ISIS-2158: bump to next Spring version -> 2.2.0.RELEASE
35496ed is described below
commit 35496edfac481637299c674048b84c68e9ccad4f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 3 14:21:04 2019 +0200
ISIS-2158: bump to next Spring version -> 2.2.0.RELEASE
- also resolving version clashes
- also pulls in spring-boot pre-release from Spring's milestone repo
(announced to be release mid Oct'19)
Spring 2.2.0 now has powerful utilities for annotation (and
meta-annotation) processing, presumably doing a better job at this, than
we can possibly ever do.
---
core/pom.xml | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e70dc70..6cc920d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -139,8 +139,8 @@
<h2.version>1.4.199</h2.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <spring-framework.version>5.1.7.RELEASE</spring-framework.version>
- <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
+ <spring-framework.version>5.2.0.RELEASE</spring-framework.version>
+ <spring-boot.version>2.2.0.RC1</spring-boot.version>
<slf4j-api.version>1.7.26</slf4j-api.version> <!-- as provided by spring-boot, needed to solve convergence issues -->
<wicket.version>8.6.1</wicket.version>
@@ -361,12 +361,12 @@
<repositories>
<repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>Apache Repository</id>
@@ -376,6 +376,13 @@
</snapshots>
</repository>
<repository>
+ <id>Spring Milestones</id>
+ <url>https://repo.spring.io/milestone/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>JBoss Public Release</id>
<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
<snapshots>
@@ -1126,6 +1133,18 @@
<artifactId>jaxws-ri</artifactId>
<version>2.3.2</version>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <!-- version clash with spring, we pull in the newer 1.3.5 below -->
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>