Author: ssteiner
Date: Tue Feb 11 12:22:50 2020
New Revision: 1873896
URL: http://svn.apache.org/viewvc?rev=1873896&view=rev
Log:
Fix compile on newer mvn
Modified:
xmlgraphics/fop/trunk/fop/build.xml
xmlgraphics/fop/trunk/pom.xml
Modified: xmlgraphics/fop/trunk/fop/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/build.xml?rev=1873896&r1=1873895&r2=1873896&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/build.xml (original)
+++ xmlgraphics/fop/trunk/fop/build.xml Tue Feb 11 12:22:50 2020
@@ -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"/>
Modified: xmlgraphics/fop/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/pom.xml?rev=1873896&r1=1873895&r2=1873896&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/pom.xml (original)
+++ xmlgraphics/fop/trunk/pom.xml Tue Feb 11 12:22:50 2020
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
