You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ga...@apache.org on 2016/03/12 06:39:55 UTC
svn commit: r1734671 [2/2] - in /xmlgraphics/fop/branches/maven: ./
fop-core/ fop-core/conf/ fop-core/examples/ fop-core/hyph/ fop-core/lib/
fop-core/src/conf/ fop-core/src/documentation/ fop-core/src/foschema/
fop-core/src/main/java/org/apache/fop/com...
Propchange: xmlgraphics/fop/branches/maven/fop/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml (added)
+++ xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>all</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>../LICENSE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/maven/**</exclude>
+ <exclude>org/apache/fop/tools/EventConventionException*</exclude>
+ <exclude>org/apache/fop/tools/EventProducerCollector*</exclude>
+ <exclude>org/apache/fop/tools/merge-translation.xsl</exclude>
+ <exclude>org/apache/fop/tools/model2translation.xsl</exclude>
+ </excludes>
+ </unpackOptions>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml (original)
+++ xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml Sat Mar 12 05:39:53 2016
@@ -30,7 +30,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
<fo:declarations>
- <fo:color-profile src="../../src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/>
+ <fo:color-profile src="../../../fop-core/src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/>
<fo:color-profile src="nonexistent.icc" color-profile-name="unknown"/>
</fo:declarations>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -54,7 +54,7 @@
<eval expected="#ff0000" xpath="//block[1]//text/@color"/>
<eval expected="#ff8000" xpath="//block[2]//text/@color"/>
<eval expected="#ff8000" xpath="//block[3]//text/@color"/>
- <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,"../../src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm",1.0,0.5,0.0)" xpath="//block[4]//text/@color"/>
+ <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,"../../../fop-core/src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm",1.0,0.5,0.0)" xpath="//block[4]//text/@color"/>
<eval expected="#00ff00" xpath="//block[5]//text/@color"/>
<eval expected="fop-rgb-icc(0.6,0.6,0.48000002,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[6]//text/@color"/>
<eval expected="fop-rgb-icc(0.6,0.6,0.4,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[7]//text/@color"/>
Modified: xmlgraphics/fop/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/pom.xml?rev=1734671&r1=1734670&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/pom.xml (original)
+++ xmlgraphics/fop/branches/maven/pom.xml Sat Mar 12 05:39:53 2016
@@ -5,15 +5,19 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
- <name>${project.groupId}:${project.artifactId}</name>
+ <name>Apache FOP Parent</name>
<description>XML Graphics Format Object Processor</description>
<packaging>pom</packaging>
<properties>
<antrun.plugin.version>1.8</antrun.plugin.version>
+ <avalon.version>4.3.1</avalon.version>
<batik.version>1.9.0-SNAPSHOT</batik.version>
<build.helper.plugin.version>1.10</build.helper.plugin.version>
<checkstyle.plugin.version>2.15</checkstyle.plugin.version>
+ <commons.io.version>1.3.1</commons.io.version>
+ <commons.logging.version>1.0.4</commons.logging.version>
+ <compiler.plugin.version>3.1</compiler.plugin.version>
<exec.plugin.version>1.4.0</exec.plugin.version>
<findbugs.plugin.version>3.0.1</findbugs.plugin.version>
<jar.plugin.version>2.6</jar.plugin.version>
@@ -23,6 +27,7 @@
<project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>
<release.plugin.version>2.5.2</release.plugin.version>
<surefire.plugin.version>2.18.1</surefire.plugin.version>
+ <war.plugin.version>2.2</war.plugin.version>
<xml.plugin.version>1.0.1</xml.plugin.version>
<xmlgraphics.commons.version>2.2.0-SNAPSHOT</xmlgraphics.commons.version>
<xmlunit.version>1.2</xmlunit.version>
@@ -43,8 +48,13 @@
<modules>
<module>fop</module>
- <!-- <module>fop-servlet</module> -->
- <!-- <module>fop-transcoder</module> -->
+ <module>fop-core</module>
+ <module>fop-events</module>
+ <module>fop-sandbox</module>
+ <module>fop-servlet</module>
+ <module>fop-transcoder</module>
+ <module>fop-transcoder-allinone</module>
+ <module>fop-util</module>
</modules>
<build>
@@ -53,6 +63,7 @@
<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>
@@ -60,6 +71,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${project.info.reports.plugin.version}</version>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org