From d1022f8e33ad8c234c13e7109fba2fe5797f5a64 Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 11 Feb 2020 12:22:50 +0000
Subject: [PATCH] Fix compile on newer mvn

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1873896 13f79535-47bb-0310-9956-ffa450edef68
---
 fop/build.xml |  2 +-
 pom.xml       | 30 ++++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/fop/build.xml b/fop/build.xml
index 527d9b21f..d4334a78f 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -615,7 +615,7 @@ list of possible build targets.
     <include name="xmlgraphics-commons*.jar"/>
   </fileset>
   <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
-    <exec executable="mvn" dir="${basedir}/..">
+    <exec executable="mvn" dir="${basedir}/.." failonerror="true">
       <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/>
       <arg value="clean"/>
       <arg value="install"/>
diff --git a/pom.xml b/pom.xml
index 39cfacad4..b7881c7e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,6 @@
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
-            <executable>${jdk.path}/bin/javac</executable>
-            <fork>true</fork>
           </configuration>
         </plugin>
         <plugin>
@@ -107,6 +105,34 @@
     </pluginManagement>
   </build>
 
+  <profiles>
+    <profile>
+      <id>custom-javac</id>
+      <activation>
+        <property>
+          <name>jdk.path</name>
+        </property>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>${compiler.plugin.version}</version>
+              <configuration>
+                <source>${java.version}</source>
+                <target>${java.version}</target>
+                <executable>${jdk.path}/bin/javac</executable>
+                <fork>true</fork>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+
   <scm>
     <connection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</connection>
     <url>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</url>
-- 
2.39.5