servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [servicemix-bundles] branch master updated: [SM-3927] Create OSGi bundle for xstream 1.4.11.1
Date Wed, 16 Jan 2019 20:14:40 GMT
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 8e01f63  [SM-3927] Create OSGi bundle for xstream 1.4.11.1
8e01f63 is described below

commit 8e01f63b93b1079efa3e81ce07e2d585f14c04e4
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Wed Jan 16 21:14:04 2019 +0100

    [SM-3927] Create OSGi bundle for xstream 1.4.11.1
---
 pom.xml                                            |   1 +
 xstream-1.4.11-java8/pom.xml                       | 133 ---------------------
 .../src/main/resources/OSGI-INF/bundle.info        |  30 -----
 {xstream-1.4.11 => xstream-1.4.11.1}/pom.xml       |   5 +-
 .../src/main/resources/OSGI-INF/bundle.info        |   0
 5 files changed, 3 insertions(+), 166 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8bae5be..94c854b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
         <module>spring-websocket-5.1.3.RELEASE</module>
         <module>spring-ldap-2.3.2.RELEASE</module>
         <module>fastinfoset-1.2.16</module>
+        <module>xstream-1.4.11.1</module>
     </modules>
 
 </project>
diff --git a/xstream-1.4.11-java8/pom.xml b/xstream-1.4.11-java8/pom.xml
deleted file mode 100644
index 83a361a..0000000
--- a/xstream-1.4.11-java8/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>13</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.xstream-java8</artifactId>
-    <version>1.4.11_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</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>com.thoughtworks.xstream</pkgGroupId>
-        <pkgArtifactId>xstream</pkgArtifactId>
-        <pkgVersion>1.4.11</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            com.thoughtworks.xstream
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            sun.misc;resolution:=optional,
-            sun.reflect;resolution:=optional,
-            com.bea.xml.stream;resolution:=optional,
-            net.sf.cglib*;resolution:=optional;version="[2.1.3,3)",
-            nu.xom;resolution:=optional;version="[1.1,2)",
-            org.codehaus.jettison*;resolution:=optional;version="[1,2)",
-            org.dom4j*;resolution:=optional;version="[1.6.1,2)",
-            org.jdom*;resolution:=optional;version="[1,2)",
-            org.joda.time*;resolution:=optional;version="[1.6,3)",
-            org.kxml2*;resolution:=optional;version="[2,3)",
-            javax.activation,
-            javax.security.auth,
-            javax.swing;resolution:=optional,
-            javax.swing.plaf;resolution:=optional,
-            javax.xml.datatype,
-            javax.xml.namespace,
-            javax.xml.parsers,
-            javax.xml.stream,
-            javax.xml.transform,
-            javax.xml.transform.sax,
-            javax.xml.transform.stream,
-            com.ctc.wstx.stax;resolution:=optional,
-            org.w3c.dom,
-            org.xml.sax,
-            org.xml.sax.helpers,
-            org.xmlpull.mxp1;resolution:=optional,
-            org.xmlpull.v1;resolution:=optional
-        </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>
-            <optional>true</optional>
-        </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>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/xstream-1.4.11-java8/src/main/resources/OSGI-INF/bundle.info b/xstream-1.4.11-java8/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 316bd0d..0000000
--- a/xstream-1.4.11-java8/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,30 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    XStream is a simple library to serialize objects to XML and back again.
-
-        * Ease of use. A high level facade is supplied that simplifies common use cases.
-        * No mappings required. Most objects can be serialized without need for specifying
mappings.
-        * Performance. Speed and low memory footprint are a crucial part of the design, making
it suitable for large
-          object graphs or systems with high message throughput.
-        * Clean XML. No information is duplicated that can be obtained via reflection. This
results in XML that is
-          easier to read for humans and more compact than native Java serialization.
-        * Requires no modifications to objects. Serializes internal fields, including private
and final. Supports
-          non-public and inner classes. Classes are not required to have default constructor.
-        * Full object graph support. Duplicate references encountered in the object-model
will be maintained. Supports
-          circular references.
-        * Integrates with other XML APIs. By implementing an interface, XStream can serialize
directly to/from any tree
-          structure (not just XML).
-        * Customizable conversion strategies. Strategies can be registered allowing customization
of how particular
-          types are represented as XML.
-        * Error messages. When an exception occurs due to malformed XML, detailed diagnostics
are provided to help
-          isolate and fix the problem.
-        * Alternative output format. The modular design allows other output formats. XStream
ships currently with JSON
-          support and morphing.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://xstream.codehaus.org/\u001B[0m
diff --git a/xstream-1.4.11/pom.xml b/xstream-1.4.11.1/pom.xml
similarity index 98%
rename from xstream-1.4.11/pom.xml
rename to xstream-1.4.11.1/pom.xml
index 8a5aa9c..62d823c 100644
--- a/xstream-1.4.11/pom.xml
+++ b/xstream-1.4.11.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-    <version>1.4.11_2-SNAPSHOT</version>
+    <version>1.4.11.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>com.thoughtworks.xstream</pkgGroupId>
         <pkgArtifactId>xstream</pkgArtifactId>
-        <pkgVersion>1.4.11-java7</pkgVersion>
+        <pkgVersion>1.4.11.1</pkgVersion>
         <servicemix.osgi.export.pkg>
             com.thoughtworks.xstream
         </servicemix.osgi.export.pkg>
diff --git a/xstream-1.4.11/src/main/resources/OSGI-INF/bundle.info b/xstream-1.4.11.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from xstream-1.4.11/src/main/resources/OSGI-INF/bundle.info
rename to xstream-1.4.11.1/src/main/resources/OSGI-INF/bundle.info


Mime
View raw message