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 2021/11/14 22:38:44 UTC
[ws-axiom] branch master updated: Stop supporting Java 8 for the build
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 3806a39 Stop supporting Java 8 for the build
3806a39 is described below
commit 3806a39d874a07e02bdbd0e9530127edf40c8dab
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Nov 14 22:38:33 2021 +0000
Stop supporting Java 8 for the build
---
.github/workflows/ci.yml | 2 +-
pom.xml | 35 +++++------------------------------
systests/osgi-tests/pom.xml | 4 ++++
3 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 01dc2b1..b6dc097 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
build:
strategy:
matrix:
- java: [ 8, 11, 15 ]
+ java: [ 11, 15 ]
name: "Java ${{ matrix.java }}"
runs-on: ubuntu-18.04
steps:
diff --git a/pom.xml b/pom.xml
index 2c42866..8c36318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -849,8 +849,8 @@
<configuration>
<rules>
<requireJavaVersion>
- <!-- We require Java 8 for the build, but we enforce Java 7 compatibility using Animal Sniffer -->
- <version>1.8.0</version>
+ <!-- We require Java 11 for the build, but we configure the compiler to enforce compatibility with older versions. -->
+ <version>11</version>
</requireJavaVersion>
<requireMavenVersion>
<!-- Require a recent Maven version for consistent build results -->
@@ -906,11 +906,9 @@
javaVersion = project.properties['javaVersion']
if (javaVersion == '1.7') {
- project.properties['signatureArtifactId'] = 'java17'
- project.properties['signatureVersion'] = '1.0'
+ project.properties['javaRelease'] = '7'
} else if (javaVersion == '1.8') {
- project.properties['signatureArtifactId'] = 'java18'
- project.properties['signatureVersion'] = '1.0'
+ project.properties['javaRelease'] = '8'
}
]]></script>
</scripts>
@@ -980,8 +978,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>${javaVersion}</source>
- <target>${javaVersion}</target>
+ <release>${javaRelease}</release>
</configuration>
</plugin>
<plugin>
@@ -996,28 +993,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version>
- <executions>
- <execution>
- <id>check</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>${signatureArtifactId}</artifactId>
- <version>${signatureVersion}</version>
- </signature>
- <checkTestClasses>false</checkTestClasses>
- </configuration>
- </plugin>
<plugin><!-- This serves two purposes:
(1) we want to generate source JARs for all builds, not just release builds;
(2) we need (some of) the source JARs to generate the Javadoc in the apidocs module. -->
diff --git a/systests/osgi-tests/pom.xml b/systests/osgi-tests/pom.xml
index b2b41c9..495e98b 100644
--- a/systests/osgi-tests/pom.xml
+++ b/systests/osgi-tests/pom.xml
@@ -31,6 +31,10 @@
<name>Axiom OSGi Tests</name>
+ <properties>
+ <javaVersion>1.8</javaVersion>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>