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 2023/04/11 13:11:52 UTC
[servicemix-bundles] branch master updated (f6501cc85 -> ae3c78c6c)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
from f6501cc85 [SM-5507] Create OSGi bundle for spring-xml 4.0.2
new 46a1167b1 Remove "old" saxon 9.9.1-6 bundle
new ae3c78c6c [SM-5508] Create OSGi bundle for saxon 12.1
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:
pom.xml | 1 +
{saxon-12.0 => saxon-12.1}/pom.xml | 7 +-
.../src/main/resources/OSGI-INF/bundle.info | 0
saxon-9.9.1-6/pom.xml | 133 ---------------------
.../src/main/resources/OSGI-INF/bundle.info | 13 --
5 files changed, 4 insertions(+), 150 deletions(-)
rename {saxon-12.0 => saxon-12.1}/pom.xml (97%)
rename {saxon-12.0 => saxon-12.1}/src/main/resources/OSGI-INF/bundle.info (100%)
delete mode 100644 saxon-9.9.1-6/pom.xml
delete mode 100644 saxon-9.9.1-6/src/main/resources/OSGI-INF/bundle.info
[servicemix-bundles] 01/02: Remove "old" saxon 9.9.1-6 bundle
Posted by jb...@apache.org.
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
commit 46a1167b158d34537c600db40c3c4d0b32fe3aad
Author: JB Onofré <jb...@dremio.com>
AuthorDate: Tue Apr 11 15:09:29 2023 +0200
Remove "old" saxon 9.9.1-6 bundle
---
saxon-9.9.1-6/pom.xml | 133 ---------------------
.../src/main/resources/OSGI-INF/bundle.info | 13 --
2 files changed, 146 deletions(-)
diff --git a/saxon-9.9.1-6/pom.xml b/saxon-9.9.1-6/pom.xml
deleted file mode 100644
index b8e39f52d..000000000
--- a/saxon-9.9.1-6/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>14</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
- <packaging>bundle</packaging>
- <version>9.9.1-6_2-SNAPSHOT</version>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps saxon he ${pkgVersion} jar files.</description>
-
- <scm>
- <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>net.sf.saxon</pkgGroupId>
- <pkgArtifactId>Saxon-HE</pkgArtifactId>
- <pkgVersion>9.9.1-6</pkgVersion>
- <servicemix.osgi.export.pkg>
- net.sf.saxon
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.stream,
- javax.xml.stream.events,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.transform.stax,
- javax.xml.xpath,
- javax.xml.xquery;resolution:=optional,
- com.saxonica.functions.map;resolution:=optional,
- com.saxonica.stream;resolution:=optional,
- org.apache.xml.resolver,
- org.apache.xml.resolver.helpers,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
- </servicemix.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- </dependency>
-
- </dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <includes>
- <include>*.xml</include>
- <include>*.xsl</include>
- <include>*.properties</include>
- <include>META-INF/services/**</include>
- <include>w3c/**</include>
- </includes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/saxon-9.9.1-6/src/main/resources/OSGI-INF/bundle.info b/saxon-9.9.1-6/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index f5289b446..000000000
--- a/saxon-9.9.1-6/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,13 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
- ${project.description}
-
- Original Maven URLs:
- \u001B[33mmvn:${pkgGroupId}/saxon9he/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
- Saxon is a XSLT and XQuery processor.
-
- It supports XSLT 2.0 and XPath 2.0, and XQuery 1.0.
-
-\u001B[1mSEE ALSO\u001B[0m
- \u001B[36mhttp://saxon.sourceforge.net/\u001B[0m
[servicemix-bundles] 02/02: [SM-5508] Create OSGi bundle for saxon 12.1
Posted by jb...@apache.org.
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
commit ae3c78c6c61741aae17d9669130b7a3874b5ed39
Author: JB Onofré <jb...@dremio.com>
AuthorDate: Tue Apr 11 15:11:24 2023 +0200
[SM-5508] Create OSGi bundle for saxon 12.1
---
pom.xml | 1 +
{saxon-12.0 => saxon-12.1}/pom.xml | 7 +++----
{saxon-12.0 => saxon-12.1}/src/main/resources/OSGI-INF/bundle.info | 0
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0361d1067..7ff159d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
<module>google-gax-grpc-2.24.0</module>
<module>jt400-11.2</module>
<module>spring-xml-4.0.2</module>
+ <module>saxon-12.1</module>
</modules>
</project>
diff --git a/saxon-12.0/pom.xml b/saxon-12.1/pom.xml
similarity index 97%
rename from saxon-12.0/pom.xml
rename to saxon-12.1/pom.xml
index 227bdddbe..72d162660 100644
--- a/saxon-12.0/pom.xml
+++ b/saxon-12.1/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.saxon</artifactId>
<packaging>bundle</packaging>
- <version>12.0_3-SNAPSHOT</version>
+ <version>12.1_1-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps saxon he ${pkgVersion} jar files.</description>
@@ -39,14 +39,13 @@
<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>net.sf.saxon</pkgGroupId>
<pkgArtifactId>Saxon-HE</pkgArtifactId>
- <pkgVersion>12.0</pkgVersion>
- <servicemix.osgi.source.version>12.0.2</servicemix.osgi.source.version>
+ <pkgVersion>12.1</pkgVersion>
+ <servicemix.osgi.source.version>12.1.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
net.sf.saxon
</servicemix.osgi.export.pkg>
diff --git a/saxon-12.0/src/main/resources/OSGI-INF/bundle.info b/saxon-12.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from saxon-12.0/src/main/resources/OSGI-INF/bundle.info
rename to saxon-12.1/src/main/resources/OSGI-INF/bundle.info