You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2020/05/24 17:13:19 UTC
[ws-axiom] branch master updated: Allow buildutils to use Java 8
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new e10d6ba Allow buildutils to use Java 8
e10d6ba is described below
commit e10d6ba322f0f097e2a5ce77e0683669d5658983
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun May 24 17:55:04 2020 +0100
Allow buildutils to use Java 8
---
buildutils/pom.xml | 1 +
pom.xml | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/buildutils/pom.xml b/buildutils/pom.xml
index bb60bf0..727df4c 100644
--- a/buildutils/pom.xml
+++ b/buildutils/pom.xml
@@ -38,6 +38,7 @@
</modules>
<properties>
+ <javaVersion>1.8</javaVersion>
<maven.version>3.0</maven.version>
</properties>
diff --git a/pom.xml b/pom.xml
index 766c8d4..aac7035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,8 @@
</distributionManagement>
<properties>
+ <javaVersion>1.7</javaVersion>
+
<osgi.version>5.0.0</osgi.version>
<failIfNoTests>false</failIfNoTests>
<aspectj.version>1.9.1</aspectj.version>
@@ -711,7 +713,7 @@
<version>3.0.1</version>
<configuration>
<detectOfflineLinks>false</detectOfflineLinks>
- <source>1.7</source>
+ <source>${javaVersion}</source>
</configuration>
</plugin>
<plugin>
@@ -909,6 +911,15 @@
println 'Disabling JaCoCo because tests are skipped'
project.properties['skipJacoco'] = 'true'
}
+
+ javaVersion = project.properties['javaVersion']
+ if (javaVersion == '1.7') {
+ project.properties['signatureArtifactId'] = 'java17'
+ project.properties['signatureVersion'] = '1.0'
+ } else if (javaVersion == '1.8') {
+ project.properties['signatureArtifactId'] = 'java18'
+ project.properties['signatureVersion'] = '1.0'
+ }
]]></script>
</scripts>
</configuration>
@@ -977,8 +988,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${javaVersion}</source>
+ <target>${javaVersion}</target>
</configuration>
</plugin>
<plugin>
@@ -1009,8 +1020,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
+ <artifactId>${signatureArtifactId}</artifactId>
+ <version>${signatureVersion}</version>
</signature>
</configuration>
</plugin>