You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2024/10/10 07:09:48 UTC

(xmlgraphics-fop-pdf-images) branch main updated: Use mvn for bundle jar

This is an automated email from the ASF dual-hosted git repository.

ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop-pdf-images.git


The following commit(s) were added to refs/heads/main by this push:
     new 37037b3  Use mvn for bundle jar
37037b3 is described below

commit 37037b36440c98a7117374bec1f8ea1f8b1b434d
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Thu Oct 10 08:09:37 2024 +0100

    Use mvn for bundle jar
---
 build.xml                              | 59 +---------------------
 pom.xml                                | 18 ++++++-
 xmlgraphics-pdfimages-pom-template.pom | 92 ----------------------------------
 3 files changed, 17 insertions(+), 152 deletions(-)

diff --git a/build.xml b/build.xml
index 8793303..0fb0829 100644
--- a/build.xml
+++ b/build.xml
@@ -207,7 +207,7 @@
 
   <target name="resourcegen" depends="compile-java">
     <taskdef name="generateEventResources" 
-      classname="org.apache.fop.tools.EventProducerCollectorTask">
+      classname="org.apache.fop.eventtools.EventProducerCollectorTask">
       <classpath refid="libs-build-tools-classpath"/>
     </taskdef>
     <generateEventResources destdir="${build.classes.dir}">
@@ -512,61 +512,4 @@
       </fileset>
     </jar>
   </target>
-  
-  <target name="maven-artifacts" depends="jar-main, jar-sources, jar-javadocs" description="Builds a Maven artifact that can be uploaded to a Maven repository">
-    <filter  token="version" value="${version}"/>
-    <mkdir dir="${build.dir}/maven"/>
-    <copy file="${basedir}/xmlgraphics-pdfimages-pom-template.pom" tofile="${build.dir}/maven/pom.xml" filtering="true"/>
-    <fileset id="bundle-files" dir="${build.dir}">
-      <patternset>
-      <include name="${name}-${version}.jar"/>
-      <include name="${name}-${version}-sources.jar"/>
-      <include name="${name}-${version}-javadoc.jar"/>
-      </patternset>
-      <patternset>
-      <include name="maven/pom.xml"/>
-      </patternset>
-    </fileset>
-    <checksum algorithm="sha-512" fileext=".sha512">
-      <fileset refid="bundle-files"/>
-    </checksum>
-    <input message="Passphrase for your default private key" addproperty="pwd">
-      <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
-    </input>
-    <antcall target="sign-file">
-      <param name="sign.archive" value="${build.dir}/${name}-${version}.jar"/>
-      <param name="pwd" value="${pwd}"/>
-    </antcall>
-    <antcall target="sign-file">
-      <param name="sign.archive" value="${build.dir}/${name}-${version}-sources.jar"/>
-      <param name="pwd" value="${pwd}"/>
-    </antcall>
-    <antcall target="sign-file">
-      <param name="sign.archive" value="${build.dir}/${name}-${version}-javadoc.jar"/>
-      <param name="pwd" value="${pwd}"/>
-    </antcall>
-    <antcall target="sign-file">
-      <param name="sign.archive" value="${build.dir}/maven/pom.xml"/>
-      <param name="pwd" value="${pwd}"/>
-    </antcall>
-    <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
-      <manifest>
-        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
-      </manifest>
-      <fileset dir="${build.dir}">
-        <patternset>
-          <include name="${name}-${version}.jar*"/>
-          <include name="${name}-${version}-sources.jar*"/>
-          <include name="${name}-${version}-javadoc.jar*"/>
-        </patternset>
-      </fileset>
-      <fileset dir="${build.dir}/maven">
-        <patternset>
-          <include name="pom.xml*"/>
-        </patternset>
-      </fileset>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-    </jar>
-    <move file="${build.dir}/${name}-${version}-bundle.jar" todir="${basedir}"/>
-  </target>  
 </project>
diff --git a/pom.xml b/pom.xml
index 7e313cf..5a1d3b7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>fop</artifactId>
-      <version>2.9</version>
+      <version>2.10</version>
     </dependency>
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
@@ -57,6 +57,20 @@
         </testResource>
     </testResources>    
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.fop.render.pdf.pdfbox.foppdfimages</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -70,7 +84,7 @@
             </goals>
             <configuration>
               <target>
-                <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask">
+                <taskdef name="collectEvents" classname="org.apache.fop.eventtools.EventProducerCollectorTask">
                   <classpath>
                     <path refid="maven.compile.classpath"/>
                   </classpath>
diff --git a/xmlgraphics-pdfimages-pom-template.pom b/xmlgraphics-pdfimages-pom-template.pom
deleted file mode 100644
index 87409a2..0000000
--- a/xmlgraphics-pdfimages-pom-template.pom
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.xmlgraphics</groupId>
-  <artifactId>fop-pdf-images</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache FOP PDF Images</name>
-  <version>@version@</version>
-  <url>https://xmlgraphics.apache.org/fop/fop-pdf-images.html</url>
-  <description>Apache FOP PDF Images plug-in extends FOP in order to add support for using PDF images in fo:external-graphic elements when generating PDF files.</description>
-  <inceptionYear>2007</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>FOP Users List</name>
-      <subscribe>fop-users-subscribe@xmlgraphics.apache.org</subscribe>
-      <unsubscribe>fop-users-unsubscribe@xmlgraphics.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive>
-    </mailingList>
-    <mailingList>
-      <name>FOP Developer List</name>
-      <subscribe>fop-dev-subscribe@xmlgraphics.apache.org</subscribe>
-      <unsubscribe>fop-dev-unsubscribe@xmlgraphics.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>FOP Commit List</name>
-      <subscribe>fop-commits-subscribe@xmlgraphics.apache.org</subscribe>
-      <unsubscribe>fop-commits-unsubscribe@xmlgraphics.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive>
-    </mailingList>
-  </mailingLists>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/?root=Apache-SVN</url>
-  </scm>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <parent>
-	<groupId>org.apache</groupId>
-	<artifactId>apache</artifactId>
-	<version>7</version>
-  </parent>
-  <dependencies>
-    <!-- XML Graphics -->
-    <dependency>
-      <groupId>org.apache.xmlgraphics</groupId>
-      <artifactId>fop</artifactId>
-      <version>2.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pdfbox</groupId>
-      <artifactId>pdfbox</artifactId>
-      <version>2.0.27</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pdfbox</groupId>
-      <artifactId>fontbox</artifactId>
-      <version>2.0.27</version>
-    </dependency>
-   </dependencies>
-</project>
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org