Fix compile on newer mvn
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1873896 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fop/build.xml b/fop/build.xml
index 527d9b2..d4334a7 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -615,7 +615,7 @@
<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 39cfaca..b7881c7 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>
