This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 6244f88869 NO-JIRA: Simplified setting of Java version
6244f88869 is described below
commit 6244f88869558d9cd2c68460e42ea3ee0c6c0678
Author: Tomas Vavricka <vavr...@apache.org>
AuthorDate: Tue Aug 8 12:48:37 2023 +0200
NO-JIRA: Simplified setting of Java version
---
broker-core/build-generate-sources.xml | 2 +-
pom.xml | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/broker-core/build-generate-sources.xml
b/broker-core/build-generate-sources.xml
index 2bf6793082..5447ae1afd 100644
--- a/broker-core/build-generate-sources.xml
+++ b/broker-core/build-generate-sources.xml
@@ -47,7 +47,7 @@
<target name="compile-logmessages-generator" >
<mkdir dir="${velocity.classes}" />
<!-- Compile LogMessages Velocity Generator -->
- <javac source="${java.source}" target="${java.target}"
+ <javac source="${minimum-java-version}"
target="${minimum-java-version}"
destdir="${velocity.classes}" debug="on"
includeantruntime="false"
srcdir="${velocity.src.dir}" >
<classpath>
diff --git a/pom.xml b/pom.xml
index 9c75e77a9a..4734ac9a0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,8 @@
<properties>
<minimum-maven-version>3.0.0</minimum-maven-version>
<minimum-java-version>11</minimum-java-version>
- <java.source>11</java.source>
- <java.target>11</java.target>
+ <maven.compiler.source>${minimum-java-version}</maven.compiler.source>
+ <maven.compiler.target>${minimum-java-version}</maven.compiler.target>
<skipTests>false</skipTests>
<!-- enforcer plugin config properties -->
@@ -990,8 +990,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>${java.source}</source>
- <target>${java.target}</target>
<optimize>true</optimize>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
