From: Peter Lemenkov <lemenkov@gmail.com>
Date: Mon, 23 Nov 2020 16:51:21 +0100
Subject: [PATCH] Revert "Fix compile on newer mvn"

This reverts commit d1022f8e33ad8c234c13e7109fba2fe5797f5a64.

diff --git a/fop/build.xml b/fop/build.xml
index 3b83424c1..a526d13dd 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}/.." failonerror="true">
+    <exec executable="mvn" dir="${basedir}/..">
       <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 3aac301c7..75eaed176 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,8 @@
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
+            <executable>${jdk.path}/bin/javac</executable>
+            <fork>true</fork>
           </configuration>
         </plugin>
         <plugin>
@@ -105,34 +107,6 @@
     </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>