You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/05/23 08:24:19 UTC

[uima-uimafit] 01/01: [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch refactoring/UIMA-6463-Use-toolchains-to-ensure-compatibility-with-Java-1_8
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit a16ccbf6eebb1cca8e4f918e79de1d65f309f6e1
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon May 23 10:24:14 2022 +0200

    [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
    
    - Add toolchain plugin
---
 uimafit-parent/pom.xml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index cd4fe6e..e5a8d63 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -43,7 +43,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <api_check_oldVersion>3.2.0</api_check_oldVersion>
-  
+
     <assertj-version>3.22.0</assertj-version>
     <commons-io-version>2.11.0</commons-io-version>
     <commons-lang3-version>3.12.0</commons-lang3-version>
@@ -87,7 +87,7 @@
       </snapshots>
     </pluginRepository>
   </pluginRepositories>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -225,6 +225,24 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <version>${maven.compiler.target}</version>
+            </jdk>
+          </toolchains>
+        </configuration>
+      </plugin>
       <plugin>
         <!-- See: https://issues.apache.org/jira/browse/UIMA-6351 -->
         <groupId>com.github.siom79.japicmp</groupId>
@@ -277,7 +295,7 @@
               <goal>execute</goal>
             </goals>
             <configuration>
-              <source>
+              <source><![CDATA[
                 def noticeFile = new File(project.basedir.path + "/NOTICE");
                 if (noticeFile.exists()) {
                   project.properties.postNoticeText = noticeFile.text;
@@ -285,7 +303,7 @@
                 } else {
                   println "No NOTICE file was found - content not loaded into property [postNoticeText]"
                 }
-              </source>
+              ]]></source>
             </configuration>
           </execution>
         </executions>