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 dd90cab44 upgrade Xalan to 2.7.3, bump bundles-pom to 15
     new fda4826ef Merge pull request #212 from OpenNMS/xalan-upstream-2.7.3
dd90cab44 is described below

commit dd90cab449e48b3f55c65c8a59af35b8a1f17366
Author: Benjamin Reed <[email protected]>
AuthorDate: Tue May 30 13:55:46 2023 -0400

    upgrade Xalan to 2.7.3, bump bundles-pom to 15
---
 {xalan-2.7.2 => xalan-2.7.3}/pom.xml                          | 11 +++++++----
 .../java/org/apache/xalan/extensions/ExtensionHandler.java    |  0
 .../main/java/org/apache/xalan/extensions/ObjectFactory.java  |  0
 .../src/main/java/org/apache/xalan/lib/ObjectFactory.java     |  0
 .../src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java |  0
 .../java/org/apache/xalan/processor/XSLTElementProcessor.java |  0
 .../src/main/java/org/apache/xalan/xslt/ObjectFactory.java    |  0
 .../java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java    |  0
 .../java/org/apache/xalan/xsltc/compiler/FunctionCall.java    |  0
 .../java/org/apache/xalan/xsltc/compiler/ObjectFactory.java   |  0
 .../org/apache/xalan/xsltc/compiler/util/ObjectFactory.java   |  0
 .../main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java   |  0
 .../java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java |  0
 .../java/org/apache/xalan/xsltc/runtime/ObjectFactory.java    |  0
 .../main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java  |  0
 .../main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java  |  0
 .../src/main/java/org/apache/xml/dtm/ObjectFactory.java       |  0
 .../src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java   |  0
 .../main/java/org/apache/xml/serializer/ObjectFactory.java    |  0
 .../src/main/java/org/apache/xml/utils/ObjectFactory.java     |  0
 .../main/java/org/apache/xpath/functions/ObjectFactory.java   |  0
 .../src/main/resources/OSGI-INF/bundle.info                   |  0
 {xalan-serializer-2.7.2 => xalan-serializer-2.7.3}/pom.xml    |  6 +++---
 .../main/java/org/apache/xml/serializer/ObjectFactory.java    |  0
 .../src/main/resources/OSGI-INF/bundle.info                   |  0
 25 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/xalan-2.7.2/pom.xml b/xalan-2.7.3/pom.xml
similarity index 95%
rename from xalan-2.7.2/pom.xml
rename to xalan-2.7.3/pom.xml
index 9e21b405a..5cb15eeb4 100644
--- a/xalan-2.7.2/pom.xml
+++ b/xalan-2.7.3/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>12</version>
+        <version>15</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
-    <version>2.7.2_4-SNAPSHOT</version>
+    <version>2.7.3_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -57,10 +57,11 @@
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
           org.apache.bcel*;version="[5.1,6)",
-          org.apache.xerces*;version="[2.8.1,3)",
-          org.apache.xml.serialize*;version="[2.7.2,3)",
+          org.apache.xerces*;version="[2.12.2,3)",
+          org.apache.xml.serialize*;version="[2.7.3,3)",
           org.w3c.dom.xpath;resolution:=optional,
           javax.naming,
+          javax.xml.datatype,
           javax.xml.namespace,
           javax.xml.parsers,
           javax.xml.transform,
@@ -86,6 +87,7 @@
         </dependency>
 
         <!-- sources -->
+        <!-- Not available
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
@@ -93,6 +95,7 @@
             <classifier>sources</classifier>
             <optional>false</optional>
         </dependency>
+        -->
     </dependencies>
 
     <build>
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/extensions/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
diff --git a/xalan-2.7.2/src/main/java/org/apache/xalan/lib/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/lib/ObjectFactory.java
similarity index 100%
rename from xalan-2.7.2/src/main/java/org/apache/xalan/lib/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xalan/lib/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
 
b/xalan-2.7.3/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
diff --git a/xalan-2.7.2/src/main/java/org/apache/xalan/xslt/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
similarity index 100%
rename from xalan-2.7.2/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java 
b/xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java
diff --git a/xalan-2.7.2/src/main/java/org/apache/xml/dtm/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xml/dtm/ObjectFactory.java
similarity index 100%
rename from xalan-2.7.2/src/main/java/org/apache/xml/dtm/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xml/dtm/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java
similarity index 100%
rename from xalan-2.7.2/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xml/serializer/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xml/serializer/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xml/serializer/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xml/serializer/ObjectFactory.java
diff --git a/xalan-2.7.2/src/main/java/org/apache/xml/utils/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xml/utils/ObjectFactory.java
similarity index 100%
rename from xalan-2.7.2/src/main/java/org/apache/xml/utils/ObjectFactory.java
rename to xalan-2.7.3/src/main/java/org/apache/xml/utils/ObjectFactory.java
diff --git 
a/xalan-2.7.2/src/main/java/org/apache/xpath/functions/ObjectFactory.java 
b/xalan-2.7.3/src/main/java/org/apache/xpath/functions/ObjectFactory.java
similarity index 100%
rename from 
xalan-2.7.2/src/main/java/org/apache/xpath/functions/ObjectFactory.java
rename to 
xalan-2.7.3/src/main/java/org/apache/xpath/functions/ObjectFactory.java
diff --git a/xalan-2.7.2/src/main/resources/OSGI-INF/bundle.info 
b/xalan-2.7.3/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from xalan-2.7.2/src/main/resources/OSGI-INF/bundle.info
rename to xalan-2.7.3/src/main/resources/OSGI-INF/bundle.info
diff --git a/xalan-serializer-2.7.2/pom.xml b/xalan-serializer-2.7.3/pom.xml
similarity index 97%
rename from xalan-serializer-2.7.2/pom.xml
rename to xalan-serializer-2.7.3/pom.xml
index 4874a7c98..1a685d880 100644
--- a/xalan-serializer-2.7.2/pom.xml
+++ b/xalan-serializer-2.7.3/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>11</version>
+        <version>15</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
-    <version>2.7.2_2-SNAPSHOT</version>
+    <version>2.7.3_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -38,7 +38,7 @@
     <properties>
         <pkgGroupId>xalan</pkgGroupId>
         <pkgArtifactId>serializer</pkgArtifactId>
-        <pkgVersion>2.7.2</pkgVersion>
+        <pkgVersion>2.7.3</pkgVersion>
         <servicemix.osgi.export.pkg>
           org.apache.xml.serializer
         </servicemix.osgi.export.pkg>
diff --git 
a/xalan-serializer-2.7.2/src/main/java/org/apache/xml/serializer/ObjectFactory.java
 
b/xalan-serializer-2.7.3/src/main/java/org/apache/xml/serializer/ObjectFactory.java
similarity index 100%
rename from 
xalan-serializer-2.7.2/src/main/java/org/apache/xml/serializer/ObjectFactory.java
rename to 
xalan-serializer-2.7.3/src/main/java/org/apache/xml/serializer/ObjectFactory.java
diff --git a/xalan-serializer-2.7.2/src/main/resources/OSGI-INF/bundle.info 
b/xalan-serializer-2.7.3/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from xalan-serializer-2.7.2/src/main/resources/OSGI-INF/bundle.info
rename to xalan-serializer-2.7.3/src/main/resources/OSGI-INF/bundle.info

Reply via email to