You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/03/25 16:41:12 UTC

svn commit: r927453 - in /pdfbox/trunk: assembly.xml fontbox/pom.xml fontbox/src/assembly/ jempbox/pom.xml jempbox/src/assembly/ pdfbox/pom.xml pdfbox/src/assembly/ pom.xml

Author: jukka
Date: Thu Mar 25 15:41:11 2010
New Revision: 927453

URL: http://svn.apache.org/viewvc?rev=927453&view=rev
Log:
PDFBOX-644: Move FontBox and JempBox under the same trunk with PDFBox

Consolidate the release assemblies.

Added:
    pdfbox/trunk/assembly.xml
      - copied, changed from r927404, pdfbox/trunk/pdfbox/src/assembly/src.xml
Removed:
    pdfbox/trunk/fontbox/src/assembly/
    pdfbox/trunk/jempbox/src/assembly/
    pdfbox/trunk/pdfbox/src/assembly/
Modified:
    pdfbox/trunk/fontbox/pom.xml
    pdfbox/trunk/jempbox/pom.xml
    pdfbox/trunk/pdfbox/pom.xml
    pdfbox/trunk/pom.xml

Copied: pdfbox/trunk/assembly.xml (from r927404, pdfbox/trunk/pdfbox/src/assembly/src.xml)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/assembly.xml?p2=pdfbox/trunk/assembly.xml&p1=pdfbox/trunk/pdfbox/src/assembly/src.xml&r1=927404&r2=927453&rev=927453&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/assembly/src.xml (original)
+++ pdfbox/trunk/assembly.xml Thu Mar 25 15:41:11 2010
@@ -24,12 +24,12 @@
       <directory>${project.basedir}</directory>
       <outputDirectory></outputDirectory>
       <excludes>
-        <exclude>bin/**</exclude>
-        <exclude>download/**</exclude>
-        <exclude>external/**</exclude>
-        <exclude>target/**</exclude>
-        <exclude>tools/**</exclude>
-        <exclude>.*/**</exclude>
+        <exclude>**/target/**</exclude>
+        <exclude>**/.*/**</exclude>
+        <exclude>pdfbox/bin/**</exclude>
+        <exclude>pdfbox/download/**</exclude>
+        <exclude>pdfbox/external/**</exclude>
+        <exclude>pdfbox/tools/**</exclude>
       </excludes>
     </fileSet>
   </fileSets>

Modified: pdfbox/trunk/fontbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=927453&r1=927452&r2=927453&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Thu Mar 25 15:41:11 2010
@@ -59,29 +59,6 @@
 
   <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>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>ikvm</id>
       <activation>
         <property>

Modified: pdfbox/trunk/jempbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/pom.xml?rev=927453&r1=927452&r2=927453&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/pom.xml (original)
+++ pdfbox/trunk/jempbox/pom.xml Thu Mar 25 15:41:11 2010
@@ -68,29 +68,6 @@
 
   <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>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>ikvm</id>
       <activation>
         <property>

Modified: pdfbox/trunk/pdfbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=927453&r1=927452&r2=927453&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Thu Mar 25 15:41:11 2010
@@ -165,33 +165,6 @@
     </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>
-
   <reporting>
     <plugins>
       <plugin>

Modified: pdfbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pom.xml?rev=927453&r1=927452&r2=927453&view=diff
==============================================================================
--- pdfbox/trunk/pom.xml (original)
+++ pdfbox/trunk/pom.xml Thu Mar 25 15:41:11 2010
@@ -49,4 +49,42 @@
     <module>pdfbox</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </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>
+                  <finalName>pdfbox-${project.version}</finalName>
+                  <descriptors>
+                    <descriptor>assembly.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>