You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2021/01/31 05:41:13 UTC
[servicemix-bundles] branch master updated: [SM-4668] Create OSGi
bundle for xerces 2.12.1
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 94f94ef [SM-4668] Create OSGi bundle for xerces 2.12.1
94f94ef is described below
commit 94f94ef2165355854eaae4871285045d563d06ac
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Jan 31 06:40:40 2021 +0100
[SM-4668] Create OSGi bundle for xerces 2.12.1
---
pom.xml | 1 +
{xerces-2.12.0 => xerces-2.12.1}/pom.xml | 15 +++++++++++----
.../src/main/java/org/apache/html/dom/ObjectFactory.java | 0
.../main/java/org/apache/xerces/dom/ObjectFactory.java | 0
.../java/org/apache/xerces/impl/dv/ObjectFactory.java | 0
.../java/org/apache/xerces/parsers/ObjectFactory.java | 0
.../java/org/apache/xerces/xinclude/ObjectFactory.java | 0
.../main/java/org/apache/xml/serialize/ObjectFactory.java | 0
.../src/main/resources/OSGI-INF/bundle.info | 0
9 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 827baf2..52ec94a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<name>Apache ServiceMix :: Bundles</name>
<modules>
+ <module>xerces-2.12.1</module>
</modules>
</project>
diff --git a/xerces-2.12.0/pom.xml b/xerces-2.12.1/pom.xml
similarity index 92%
rename from xerces-2.12.0/pom.xml
rename to xerces-2.12.1/pom.xml
index 8b879ce..ee369fd 100644
--- a/xerces-2.12.0/pom.xml
+++ b/xerces-2.12.1/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>13</version>
+ <version>14</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
- <version>2.12.0_2-SNAPSHOT</version>
+ <version>2.12.1_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -39,13 +39,12 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
- <tag>HEAD</tag>
</scm>
<properties>
<pkgGroupId>xerces</pkgGroupId>
<pkgArtifactId>xercesImpl</pkgArtifactId>
- <pkgVersion>2.12.0</pkgVersion>
+ <pkgVersion>2.12.1</pkgVersion>
<servicemix.osgi.export.pkg>
org.apache.html*;version=${pkgVersion};-split-package:=merge-first,
org.apache.wml*;version=${pkgVersion};-split-package:=merge-first,
@@ -96,6 +95,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
diff --git a/xerces-2.12.0/src/main/java/org/apache/html/dom/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/html/dom/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/html/dom/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/html/dom/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/java/org/apache/xerces/dom/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/xerces/dom/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/xerces/dom/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/xerces/dom/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/java/org/apache/xerces/impl/dv/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/xerces/impl/dv/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/xerces/impl/dv/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/xerces/impl/dv/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/java/org/apache/xerces/parsers/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/xerces/parsers/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/xerces/parsers/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/xerces/parsers/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/java/org/apache/xerces/xinclude/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/xerces/xinclude/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/xerces/xinclude/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/xerces/xinclude/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/java/org/apache/xml/serialize/ObjectFactory.java b/xerces-2.12.1/src/main/java/org/apache/xml/serialize/ObjectFactory.java
similarity index 100%
rename from xerces-2.12.0/src/main/java/org/apache/xml/serialize/ObjectFactory.java
rename to xerces-2.12.1/src/main/java/org/apache/xml/serialize/ObjectFactory.java
diff --git a/xerces-2.12.0/src/main/resources/OSGI-INF/bundle.info b/xerces-2.12.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from xerces-2.12.0/src/main/resources/OSGI-INF/bundle.info
rename to xerces-2.12.1/src/main/resources/OSGI-INF/bundle.info