Skip to content

Commit

Permalink
Use Java 11 as minimum for build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@joehni
joehni committed Dec 29, 2022
1 parent d8bc4c7 commit 1fcfa0b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 85 deletions.
2 changes: 1 addition & 1 deletion BUILD.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
For Java 8 or higher build with Maven 3
For Java 11 or higher build with Maven 3

Before building:

Expand Down
14 changes: 5 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.plugin.maven.compiler}</version>
<configuration>
<source>${version.java.source}</source>
<target>${version.java.target}</target>
<release>${version.java.target}</release>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -781,8 +780,7 @@
<Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version>
<Bundle-License>BSD-3-Clause</Bundle-License>
<Automatic-Module-Name>${jar.module.name}</Automatic-Module-Name>
<X-Compile-Source>${version.java.source}</X-Compile-Source>
<X-Compile-Target>${version.java.target}</X-Compile-Target>
<X-Compile-Release>${version.java.release}</X-Compile-Release>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -873,8 +871,7 @@
<Bundle-Version>${project.info.osgiVersion}</Bundle-Version>
<Bundle-License>BSD-3-Clause</Bundle-License>
<Eclipse-SourceBundle>${project.artifactId};version=${project.info.osgiVersion}</Eclipse-SourceBundle>
<X-Compile-Source>${version.java.source}</X-Compile-Source>
<X-Compile-Target>${version.java.target}</X-Compile-Target>
<X-Compile-Release>${version.java.release}</X-Compile-Release>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -1075,9 +1072,8 @@
<project.build.outputTimestamp>1</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.java.source>1.8</version.java.source>
<version.java.target>1.8</version.java.target>
<version.java.enforced>[1.8,)</version.java.enforced>
<version.java.target>11</version.java.target>
<version.java.enforced>[11,)</version.java.enforced>
<version.maven.enforced>[3.3.9,)</version.maven.enforced>

<version.plugin.codehaus.xsite>1.3</version.plugin.codehaus.xsite>
Expand Down
4 changes: 2 additions & 2 deletions xstream-hibernate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
</build>
</profile>
<profile>
<id>jdk9-ge-jdk16</id>
<id>jdk11-ge-jdk16</id>
<activation>
<jdk>[9,17)</jdk>
<jdk>[11,17)</jdk>
</activation>
<properties>
<surefire.argline>--illegal-access=${surefire.illegal.access}</surefire.argline>
Expand Down
23 changes: 1 addition & 22 deletions xstream-jmh/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Copyright (C) 2015, 2017, 2018, 2019, 2020, 2021 XStream committers.
Copyright (C) 2015, 2017, 2018, 2019, 2020, 2021, 2022 XStream committers.
All rights reserved.
The software in this package is published under the terms of the BSD
Expand Down Expand Up @@ -59,27 +59,6 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk9-ge-jdk10</id>
<activation>
<jdk>[9,11)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<fork>true</fork>
<compilerArgs>
<arg>-J--add-modules</arg>
<arg>-Jjava.xml.ws.annotation</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
Expand Down
63 changes: 12 additions & 51 deletions xstream/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,30 +365,9 @@
</properties>
</profile>
<profile>
<id>jdk11-ge</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta.xml.bind.api}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk9-ge-jdk14</id>
<id>jdk11-ge-jdk14</id>
<activation>
<jdk>[9,15)</jdk>
<jdk>[11,15)</jdk>
</activation>
<build>
<plugins>
Expand All @@ -405,18 +384,9 @@
</build>
</profile>
<profile>
<id>jdk9-ge-jdk10</id>
<activation>
<jdk>[9,11)</jdk>
</activation>
<properties>
<surefire.argline>--add-modules java.activation,java.xml.bind --illegal-access=${surefire.illegal.access}</surefire.argline>
</properties>
</profile>
<profile>
<id>jdk8-ge</id>
<id>jdk11-ge</id>
<activation>
<jdk>[1.8,)</jdk>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
Expand All @@ -429,25 +399,16 @@
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
<exclude>**/*09Test.java</exclude>
<exclude>**/Record**</exclude>
</testExcludes>
</configuration>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jakarta.xml.bind.api}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 1fcfa0b

Please sign in to comment.