Browse Source

Fix compile on newer mvn

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1873896 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-2_5
Simon Steiner 4 years ago
parent
commit
d1022f8e33
2 changed files with 29 additions and 3 deletions
  1. 1
    1
      fop/build.xml
  2. 28
    2
      pom.xml

+ 1
- 1
fop/build.xml View File

@@ -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"/>

+ 28
- 2
pom.xml View File

@@ -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>

Loading…
Cancel
Save