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 2021/12/23 18:27:04 UTC
[isis] 04/05: Revert "ISIS-2932: minor pom housekeeping"
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
commit 501e17d2f1419929cbb00ebf5c6fbf8bb669ab36
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 23 19:09:16 2021 +0100
Revert "ISIS-2932: minor pom housekeeping"
This reverts commit 935003a47aba26e993539dba08b2bd436151c81c.
---
core/pom.xml | 1 +
pom.xml | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 51d210f..db405c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -175,6 +175,7 @@
<shiro.version>1.8.0</shiro.version>
<simpleslackapi.version>1.3.0</simpleslackapi.version>
<slf4j-api.version>1.7.32</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
+ <spring-boot.version>2.6.2</spring-boot.version> <!-- has no effect here, needs to be set in isis-parent/pom.xml -->
<summernote.version>0.8.11</summernote.version>
<swagger-core.version>1.6.3</swagger-core.version>
diff --git a/pom.xml b/pom.xml
index 7971492..1caf367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
</description>
<properties>
- <maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy, comment out when doing a release -->
+ <maven.deploy.skip>true</maven.deploy.skip> <!-- don't deploy the aggregator -->
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
@@ -48,8 +48,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<gpg.useagent>true</gpg.useagent>
- <minimalMavenBuildVersion>3.6.0</minimalMavenBuildVersion>
- <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
+ <minimalMavenBuildVersion>3.1.1</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -59,7 +59,6 @@
<!-- historically was overriding Spring, as v3.0.0 breaks artifact retrieval of org.jruby:jruby (of any version) -->
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
- <spring-boot.version>2.6.2</spring-boot.version>
<lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
<delombok.output>${project.build.directory}/delombok</delombok.output>
<surefire.version>2.22.2</surefire.version>