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 2020/05/15 08:20:43 UTC
[isis] branch master updated: ISIS-2366: Bump to latest Spring
Releases
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new cf176e2 ISIS-2366: Bump to latest Spring Releases
cf176e2 is described below
commit cf176e2baa7ad93032a568e7581205fa0b82549d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 15 10:20:28 2020 +0200
ISIS-2366: Bump to latest Spring Releases
- also add joda-time as a dependency managed resource (seems no longer
part of the spring ecosystem)
- also bump jaxws-ri 2.3.2 -> 2.3.3 to resolve version clashes
---
core-parent/pom.xml | 2 +-
core/pom.xml | 13 +++-
core/webapp/pom.xml | 186 ++++++++++++++++++++++++++--------------------------
starters/pom.xml | 2 +-
4 files changed, 104 insertions(+), 99 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index 8c3432b..c1f44be 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -45,7 +45,7 @@ under the License.
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.6.RELEASE</version>
+ <version>2.3.0.RELEASE</version>
<relativePath/>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index c24b955..5cc8d9a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -123,7 +123,7 @@
<javax-servlet.version>3.1.0</javax-servlet.version>
<jaxb-core.version>2.3.0.1</jaxb-core.version> <!-- 2.3.2 is not yet available -->
<jaxb-impl.version>2.3.2</jaxb-impl.version>
- <jaxws-ri.version>2.3.2</jaxws-ri.version>
+ <jaxws-ri.version>2.3.3</jaxws-ri.version>
<jbcrypt.version>0.4</jbcrypt.version>
<jboss-jaxrs-api_2.0_spec.version>1.0.0.Final</jboss-jaxrs-api_2.0_spec.version>
@@ -133,6 +133,7 @@
<jdom.version>2.0.2</jdom.version>
<jmock.version>2.11.0</jmock.version>
+ <joda-time.version>2.10.6</joda-time.version>
<jopt-simple.version>6.0-alpha-3</jopt-simple.version>
<jquery-ui.version>1.12.1</jquery-ui.version>
@@ -166,8 +167,8 @@
<cors-filter.version>1.0.1</cors-filter.version>
<simpleslackapi.version>1.2.0</simpleslackapi.version>
<slf4j-api.version>1.7.26</slf4j-api.version> <!-- as provided by spring-boot, needed to solve convergence issues -->
- <spring-framework.version>5.2.5.RELEASE</spring-framework.version>
- <spring-boot.version>2.2.6.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in core-parent/pom.xml -->
+ <spring-framework.version>5.2.6.RELEASE</spring-framework.version>
+ <spring-boot.version>2.3.0.RELEASE</spring-boot.version> <!-- has no effect here, needs to be set in core-parent/pom.xml -->
<summernote.version>0.8.11</summernote.version>
<swagger-core.version>1.6.0</swagger-core.version>
@@ -974,6 +975,12 @@
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda-time.version}</version>
+ </dependency>
<dependency>
<groupId>com.approvaltests</groupId>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index fcf0039..b8be1f8 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -1,113 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- http://www.apache.org/licenses/LICENSE-2.0
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-core-webapp</artifactId>
- <name>Apache Isis Core - WebApp</name>
- <description>
+ <artifactId>isis-core-webapp</artifactId>
+ <name>Apache Isis Core - WebApp</name>
+ <description>
Bundles all the web specific classes a srequired by viewers.
Introduced to keep the 'runtime' package concise.
</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.webapp</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/webapp</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.webapp</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/webapp</git-plugin.propertiesDir>
+ </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator</artifactId>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- <exclusions>
- <exclusion>
- <!-- don't bring in Spring's default logging, otherwise breaks DN enhancer -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
- <!-- TESTING -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- don't bring in Spring's default logging, otherwise breaks DN enhancer -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
+ </dependency>
+
+ <!-- TESTING -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/starters/pom.xml b/starters/pom.xml
index eacfcd0..8ebd23a 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -46,7 +46,7 @@ under the License.
<maven.compiler.arg>-parameters</maven.compiler.arg>
- <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
+ <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
<approvaltests.version>4.0.2</approvaltests.version>
<resteasy.version>4.4.1.Final</resteasy.version>