You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2020/11/23 11:29:22 UTC

[servicemix-bundles] branch master updated (a77b59c -> ddc23fa)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git.


    from a77b59c  [SM-4583] Added Xstream to pom
     new 5e86e33  [SM-4584] Create OSGi bundle for FOP 2.5
     new ddc23fa  [SM-4584] Added FOP to POM

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 {fop-2.3 => fop-2.5}/pom.xml                                 | 12 ++----------
 {fop-2.3 => fop-2.5}/src/main/resources/OSGI-INF/bundle.info |  0
 pom.xml                                                      |  1 +
 3 files changed, 3 insertions(+), 10 deletions(-)
 rename {fop-2.3 => fop-2.5}/pom.xml (94%)
 rename {fop-2.3 => fop-2.5}/src/main/resources/OSGI-INF/bundle.info (100%)


[servicemix-bundles] 01/02: [SM-4584] Create OSGi bundle for FOP 2.5

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git

commit 5e86e334af0b5d4b3fc3fbffc50ee2a5851445d0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 23 12:26:20 2020 +0100

    [SM-4584] Create OSGi bundle for FOP 2.5
---
 {fop-2.3 => fop-2.5}/pom.xml                                 | 12 ++----------
 {fop-2.3 => fop-2.5}/src/main/resources/OSGI-INF/bundle.info |  0
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/fop-2.3/pom.xml b/fop-2.5/pom.xml
similarity index 94%
rename from fop-2.3/pom.xml
rename to fop-2.5/pom.xml
index 8080dd1..0d3b800 100644
--- a/fop-2.3/pom.xml
+++ b/fop-2.5/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.fop</artifactId>
-    <version>2.3_2-SNAPSHOT</version>
+    <version>2.5_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -45,7 +45,7 @@
     <properties>
         <pkgGroupId>org.apache.xmlgraphics</pkgGroupId>
         <pkgArtifactId>fop</pkgArtifactId>
-        <pkgVersion>2.3</pkgVersion>
+        <pkgVersion>2.5</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.apache.fop
         </servicemix.osgi.export.pkg>
@@ -107,14 +107,6 @@
             <artifactId>avalon-framework-impl</artifactId>
             <version>4.3.1</version>
         </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/fop-2.3/src/main/resources/OSGI-INF/bundle.info b/fop-2.5/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from fop-2.3/src/main/resources/OSGI-INF/bundle.info
rename to fop-2.5/src/main/resources/OSGI-INF/bundle.info


[servicemix-bundles] 02/02: [SM-4584] Added FOP to POM

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git

commit ddc23fab69c3d356456d17388cb6720a7993dfd8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 23 12:28:47 2020 +0100

    [SM-4584] Added FOP to POM
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 32f45a8..e36548e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
 
     <modules>
       <module>xstream-1.4.14</module>
+      <module>fop-2.5</module>
     </modules>
 
 </project>