This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 1342bfc925 specify encoding, bump maven compiler, version bump of
groovy plugins
1342bfc925 is described below
commit 1342bfc92582503016b22ded7a97443026ad5e90
Author: Alex Heneveld <[email protected]>
AuthorDate: Mon Sep 4 12:21:28 2023 +0100
specify encoding, bump maven compiler, version bump of groovy plugins
to make work with maven 3.9 on recent debian (used by apache build server)
---
core/pom.xml | 4 ++--
parent/pom.xml | 4 +++-
pom.xml | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8cbfa5c021..a0979a6b48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -284,12 +284,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.1-01</version>
+ <version>${groovy-eclipse-compiler.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>${groovy-eclipse-batch.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index caeb6b4955..a8133a7393 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,10 +83,12 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
+ <encoding>UTF-8</encoding>
+ <!-- <release>8</release> only available with more
recent JVMs -->
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 773d82a318..440e84e64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,9 @@
<!-- @deprecated since 0.11 -->
<httpclient.version>4.5.13</httpclient.version> <!-- kept for
compatibility in 0.11.0-SNAPSHOT, remove after -->
<commons-lang3.version>3.12.0</commons-lang3.version>
- <groovy.version>2.4.15</groovy.version> <!-- Version 2.4.7 supported
by
https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes;
not sure what more recent will be -->
+ <groovy.version>2.4.21</groovy.version> <!-- 2.4 seems to be an LTS;
later versions switch to using a pom not a jar for groovy all, then in 4 to
using modules and hosted at apache rather than codehaus; note the
groovy-eclipse-complier versions below -->
+
<groovy-eclipse-compiler.version>2.9.1-01</groovy-eclipse-compiler.version>
<!-- see
https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes
-->
+ <groovy-eclipse-batch.version>2.4.21-01</groovy-eclipse-batch.version>
<snakeyaml.version>1.33</snakeyaml.version> <!-- align with cxf,
jackson-dataformat-yaml -->
<snakeyaml.jclouds.version>1.26</snakeyaml.jclouds.version> <!--
jclouds 2.4 imports this -->
<!-- Next version of swagger requires changes to how path mapping and
scanner injection are done. -->