Author: jukka
Date: Wed Mar 17 22:59:43 2010
New Revision: 924544
URL: http://svn.apache.org/viewvc?rev=924544&view=rev
Log:
PDFBOX-644: Move FontBox and JempBox under the same trunk with PDFBox
Use a shared parent POM to avoid duplicating POM settings.
Added:
pdfbox/trunk/parent/ (with props)
pdfbox/trunk/parent/pom.xml
- copied, changed from r924515, pdfbox/trunk/pdfbox/pom.xml
Modified:
pdfbox/trunk/fontbox/pom.xml
pdfbox/trunk/jempbox/pom.xml
pdfbox/trunk/pdfbox/pom.xml
pdfbox/trunk/pom.xml
Modified: pdfbox/trunk/fontbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=924544&r1=924543&r2=924544&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Wed Mar 17 22:59:43 2010
@@ -19,14 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache FontBox</name>
@@ -38,17 +37,6 @@
<inceptionYear>2008</inceptionYear>
<url>http://pdfbox.apache.org/</url>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/PDFBOX</url>
- </issueManagement>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/pdfbox/fontbox/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/pdfbox/fontbox/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/pdfbox/fontbox/trunk/</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -61,30 +49,11 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.0</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: pdfbox/trunk/jempbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/pom.xml?rev=924544&r1=924543&r2=924544&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/pom.xml (original)
+++ pdfbox/trunk/jempbox/pom.xml Wed Mar 17 22:59:43 2010
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>jempbox</artifactId>
- <version>1.0.1</version>
<packaging>bundle</packaging>
<name>Apache JempBox</name>
@@ -37,20 +36,7 @@
JempBox is an open source Java library that implements Adobe's XMP(TM)
specification. JempBox is a subproject of Apache PDFBox.
</description>
-
<inceptionYear>2008</inceptionYear>
- <url>http://pdfbox.apache.org/</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/PDFBOX</url>
- </issueManagement>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/pdfbox/jempbox/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/pdfbox/jempbox/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/pdfbox/jempbox/trunk/</url>
- </scm>
<dependencies>
<dependency>
@@ -64,13 +50,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.0</version>
@@ -84,15 +63,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
</plugins>
</build>
Propchange: pdfbox/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 17 22:59:43 2010
@@ -0,0 +1,2 @@
+.*
+target
Copied: pdfbox/trunk/parent/pom.xml (from r924515, pdfbox/trunk/pdfbox/pom.xml)
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?p2=pdfbox/trunk/parent/pom.xml&p1=pdfbox/trunk/pdfbox/pom.xml&r1=924515&r2=924544&rev=924544&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Wed Mar 17 22:59:43 2010
@@ -27,96 +27,22 @@
</parent>
<groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <artifactId>pdfbox-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Apache PDFBox</name>
- <description>
- Apache PDFBox is an open source Java library for working with PDF
documents.
- </description>
+ <name>PDFBox parent</name>
<inceptionYear>2002</inceptionYear>
- <url>http://pdfbox.apache.org/</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/PDFBOX</url>
</issueManagement>
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/pdfbox/trunk
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/pdfbox/trunk
- </developerConnection>
- <url>http://svn.apache.org/viewvc/pdfbox/trunk</url>
- </scm>
-
<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>fontbox</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>jempbox</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.4.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-demos</artifactId>
- <version>2.4.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
- <version>1.44</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.44</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -132,94 +58,12 @@
<source>1.5</source>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://lucene.apache.org/java/2_4_1/api/</link>
</links>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <ant antfile="build.xml" target="get.adobefiles" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>org/apache/pdfbox/TestAll.java</include>
- <include>org/apache/pdfbox/util/TestTextStripper.java</include>
- <!--
- <include>org/apache/pdfbox/util/TestPDFToImage.java</include>
- -->
- </includes>
- <systemPropertyVariables>
-
<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>http://pdfbox.apache.org/</Bundle-DocURL>
- <Include-Resource>
- META-INF=target/maven-shared-archive-resources/META-INF,
- Resources=target/classes/Resources
- </Include-Resource>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<!-- Developers listed by PMC Chair, PMC all alphabetical-->
<developers>
<developer>
@@ -286,13 +130,5 @@
</roles>
</developer>
</developers>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: pdfbox/trunk/pdfbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=924544&r1=924543&r2=924544&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Wed Mar 17 22:59:43 2010
@@ -21,14 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache PDFBox</name>
@@ -36,37 +35,17 @@
Apache PDFBox is an open source Java library for working with PDF
documents.
</description>
<inceptionYear>2002</inceptionYear>
- <url>http://pdfbox.apache.org/</url>
-
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/PDFBOX</url>
- </issueManagement>
-
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/pdfbox/trunk
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/pdfbox/trunk
- </developerConnection>
- <url>http://svn.apache.org/viewvc/pdfbox/trunk</url>
- </scm>
-
- <properties>
- <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>jempbox</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -120,13 +99,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.5</target>
- <source>1.5</source>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -220,73 +192,6 @@
</profile>
</profiles>
- <!-- Developers listed by PMC Chair, PMC all alphabetical-->
- <developers>
- <developer>
- <id>lehmi</id>
- <name>Andreas Lehmkühler</name>
- <roles>
- <role>PMC Chair</role>
- </roles>
- </developer>
- <developer>
- <id>blitchfield</id>
- <name>Ben Litchfield</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>carrier</id>
- <name>Brian Carrier</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>danielwilson</id>
- <name>Daniel Wilson</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>jeremias</id>
- <name>Jeremias Maerki</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>koch</id>
- <name>Johannes Koch</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>jukka</id>
- <name>Jukka Zitting</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>pkoch</id>
- <name>Phillipp Koch</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- <developer>
- <id>vfed</id>
- <name>Villu Ruusmann</name>
- <roles>
- <role>PMC Member</role>
- </roles>
- </developer>
- </developers>
-
<reporting>
<plugins>
<plugin>
Modified: pdfbox/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pom.xml?rev=924544&r1=924543&r2=924544&view=diff
==============================================================================
--- pdfbox/trunk/pom.xml (original)
+++ pdfbox/trunk/pom.xml Wed Mar 17 22:59:43 2010
@@ -21,14 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-reactor</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PDFBox reactor</name>
@@ -44,8 +43,9 @@
</scm>
<modules>
- <module>jempbox</module>
+ <module>parent</module>
<module>fontbox</module>
+ <module>jempbox</module>
<module>pdfbox</module>
</modules>
