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 2017/12/20 12:50:03 UTC

[1/5] servicemix-bundles git commit: [SM-3569] Create OSGi bundle for Influxdb Java 2.8

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master b575dc115 -> 0456d0cc5


[SM-3569] Create OSGi bundle for Influxdb Java 2.8


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/654b7146
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/654b7146
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/654b7146

Branch: refs/heads/master
Commit: 654b71465cb2c50399e82753242a928da53d874a
Parents: b575dc1
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 20 13:21:58 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 20 13:21:58 2017 +0100

----------------------------------------------------------------------
 influxdb-java-2.7/pom.xml                       | 117 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  11 --
 influxdb-java-2.8/pom.xml                       | 117 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 5 files changed, 129 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/654b7146/influxdb-java-2.7/pom.xml
----------------------------------------------------------------------
diff --git a/influxdb-java-2.7/pom.xml b/influxdb-java-2.7/pom.xml
deleted file mode 100644
index 08831f8..0000000
--- a/influxdb-java-2.7/pom.xml
+++ /dev/null
@@ -1,117 +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.influxdb-java</artifactId>
-    <version>2.7_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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <pkgGroupId>org.influxdb</pkgGroupId>
-        <pkgArtifactId>influxdb-java</pkgArtifactId>
-        <pkgVersion>2.7</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.influxdb
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            com.google.common.base,
-            com.google.common.collect,
-            com.google.common.escape,
-            com.google.common.io,
-            okhttp3,
-            okhttp3.logging,
-            okio,
-            retrofit2,
-            retrofit2.http,
-            retrofit2.converter.moshi
-        </servicemix.osgi.import.pkg>
-        <servicemix.osgi.private.pkg>
-        </servicemix.osgi.private.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>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/654b7146/influxdb-java-2.7/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/influxdb-java-2.7/src/main/resources/OSGI-INF/bundle.info b/influxdb-java-2.7/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 7650efe..0000000
--- a/influxdb-java-2.7/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    InfluxDB Java driver is a Java client to interact with an Influx Database.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttps://github.com/influxdata/influxdb-java\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/654b7146/influxdb-java-2.8/pom.xml
----------------------------------------------------------------------
diff --git a/influxdb-java-2.8/pom.xml b/influxdb-java-2.8/pom.xml
new file mode 100644
index 0000000..61f486b
--- /dev/null
+++ b/influxdb-java-2.8/pom.xml
@@ -0,0 +1,117 @@
+<?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.influxdb-java</artifactId>
+    <version>2.8_1-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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+      <tag>HEAD</tag>
+  </scm>
+
+    <properties>
+        <pkgGroupId>org.influxdb</pkgGroupId>
+        <pkgArtifactId>influxdb-java</pkgArtifactId>
+        <pkgVersion>2.8</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.influxdb
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            com.google.common.base,
+            com.google.common.collect,
+            com.google.common.escape,
+            com.google.common.io,
+            okhttp3,
+            okhttp3.logging,
+            okio,
+            retrofit2,
+            retrofit2.http,
+            retrofit2.converter.moshi
+        </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+        </servicemix.osgi.private.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>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/654b7146/influxdb-java-2.8/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/influxdb-java-2.8/src/main/resources/OSGI-INF/bundle.info b/influxdb-java-2.8/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..7650efe
--- /dev/null
+++ b/influxdb-java-2.8/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    InfluxDB Java driver is a Java client to interact with an Influx Database.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttps://github.com/influxdata/influxdb-java\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/654b7146/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83558f6..7e3e624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 
     <modules>
         <module>okhttp-3.9.1</module>
+        <module>influxdb-java-2.8</module>
     </modules>
 
 </project>


[4/5] servicemix-bundles git commit: [SM-3572] Create OSGi bundle for Java-util 1.34.0

Posted by ac...@apache.org.
[SM-3572] Create OSGi bundle for Java-util 1.34.0


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/65e644c1
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/65e644c1
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/65e644c1

Branch: refs/heads/master
Commit: 65e644c1447dbee306f512229640aa3a15685cf0
Parents: 5edea01
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 20 13:42:50 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 20 13:42:50 2017 +0100

----------------------------------------------------------------------
 java-util-1.32.0/pom.xml                        | 99 --------------------
 .../src/main/resources/OSGI-INF/bundle.info     | 11 ---
 java-util-1.34.0/pom.xml                        | 99 ++++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     | 11 +++
 pom.xml                                         |  1 +
 5 files changed, 111 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/65e644c1/java-util-1.32.0/pom.xml
----------------------------------------------------------------------
diff --git a/java-util-1.32.0/pom.xml b/java-util-1.32.0/pom.xml
deleted file mode 100644
index 2658d64..0000000
--- a/java-util-1.32.0/pom.xml
+++ /dev/null
@@ -1,99 +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.java-util</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.32.0_2-SNAPSHOT</version>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <scm>
-        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <pkgGroupId>com.cedarsoftware</pkgGroupId>
-        <pkgArtifactId>java-util</pkgArtifactId>
-        <pkgVersion>1.32.0</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            com.cedarsoftware.util
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <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>
-                                    <includes>
-                                        <include>**/*.gif</include>
-                                        <include>**/*.xsl</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/65e644c1/java-util-1.32.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/java-util-1.32.0/src/main/resources/OSGI-INF/bundle.info b/java-util-1.32.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 3e351a1..0000000
--- a/java-util-1.32.0/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URLs:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Rarely available and hard-to-write Java utilities, written correctly, and thoroughly tested 
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttps://github.com/jdereg/java-util/\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/65e644c1/java-util-1.34.0/pom.xml
----------------------------------------------------------------------
diff --git a/java-util-1.34.0/pom.xml b/java-util-1.34.0/pom.xml
new file mode 100644
index 0000000..0490cae
--- /dev/null
+++ b/java-util-1.34.0/pom.xml
@@ -0,0 +1,99 @@
+<?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.java-util</artifactId>
+    <packaging>bundle</packaging>
+    <version>1.34.0_1-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+    <scm>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+      <tag>HEAD</tag>
+  </scm>
+
+    <properties>
+        <pkgGroupId>com.cedarsoftware</pkgGroupId>
+        <pkgArtifactId>java-util</pkgArtifactId>
+        <pkgVersion>1.34.0</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            com.cedarsoftware.util
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <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>
+                                    <includes>
+                                        <include>**/*.gif</include>
+                                        <include>**/*.xsl</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/65e644c1/java-util-1.34.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/java-util-1.34.0/src/main/resources/OSGI-INF/bundle.info b/java-util-1.34.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..3e351a1
--- /dev/null
+++ b/java-util-1.34.0/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URLs:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Rarely available and hard-to-write Java utilities, written correctly, and thoroughly tested 
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttps://github.com/jdereg/java-util/\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/65e644c1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4ec8b6..06a44fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <module>influxdb-java-2.8</module>
         <module>fastjson-1.2.43</module>
         <module>sparkjava-core-2.7.1</module>
+        <module>java-util-1.34.0</module>
     </modules>
 
 </project>


[5/5] servicemix-bundles git commit: [SM-3573] Create OSGi bundle for Libphonenumber 8.8.8

Posted by ac...@apache.org.
[SM-3573] Create OSGi bundle for Libphonenumber 8.8.8


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/0456d0cc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/0456d0cc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/0456d0cc

Branch: refs/heads/master
Commit: 0456d0cc51b39687c951cee77281389bbd668813
Parents: 65e644c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 20 13:47:12 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 20 13:47:12 2017 +0100

----------------------------------------------------------------------
 libphonenumber-8.8.6/pom.xml                    | 105 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  12 ---
 libphonenumber-8.8.8/pom.xml                    | 105 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +++
 pom.xml                                         |   1 +
 5 files changed, 118 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0456d0cc/libphonenumber-8.8.6/pom.xml
----------------------------------------------------------------------
diff --git a/libphonenumber-8.8.6/pom.xml b/libphonenumber-8.8.6/pom.xml
deleted file mode 100644
index 25645c9..0000000
--- a/libphonenumber-8.8.6/pom.xml
+++ /dev/null
@@ -1,105 +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.libphonenumber</artifactId>
-    <version>8.8.6_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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <pkgGroupId>com.googlecode.libphonenumber</pkgGroupId>
-        <pkgArtifactId>libphonenumber</pkgArtifactId>
-        <pkgVersion>8.8.6</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            com.google.i18n.phonenumbers
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-        </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>META-INF/services/**</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0456d0cc/libphonenumber-8.8.6/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/libphonenumber-8.8.6/src/main/resources/OSGI-INF/bundle.info b/libphonenumber-8.8.6/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 708a46f..0000000
--- a/libphonenumber-8.8.6/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,12 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Google's common Java library for parsing, formatting, storing and validating international phone numbers.
-    Optimized for running on smartphones.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttps://github.com/googlei18n/libphonenumber\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0456d0cc/libphonenumber-8.8.8/pom.xml
----------------------------------------------------------------------
diff --git a/libphonenumber-8.8.8/pom.xml b/libphonenumber-8.8.8/pom.xml
new file mode 100644
index 0000000..47221cf
--- /dev/null
+++ b/libphonenumber-8.8.8/pom.xml
@@ -0,0 +1,105 @@
+<?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.libphonenumber</artifactId>
+    <version>8.8.8_1-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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+      <tag>HEAD</tag>
+  </scm>
+
+    <properties>
+        <pkgGroupId>com.googlecode.libphonenumber</pkgGroupId>
+        <pkgArtifactId>libphonenumber</pkgArtifactId>
+        <pkgVersion>8.8.8</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            com.google.i18n.phonenumbers
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+        </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>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0456d0cc/libphonenumber-8.8.8/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/libphonenumber-8.8.8/src/main/resources/OSGI-INF/bundle.info b/libphonenumber-8.8.8/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..708a46f
--- /dev/null
+++ b/libphonenumber-8.8.8/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,12 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Google's common Java library for parsing, formatting, storing and validating international phone numbers.
+    Optimized for running on smartphones.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttps://github.com/googlei18n/libphonenumber\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0456d0cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 06a44fa..7ae3775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <module>fastjson-1.2.43</module>
         <module>sparkjava-core-2.7.1</module>
         <module>java-util-1.34.0</module>
+        <module>libphonenumber-8.8.8</module>
     </modules>
 
 </project>


[2/5] servicemix-bundles git commit: [SM-3570] Create OSGi bundle for Fastjson 1.2.43

Posted by ac...@apache.org.
[SM-3570] Create OSGi bundle for Fastjson 1.2.43


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/d75a1fde
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/d75a1fde
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/d75a1fde

Branch: refs/heads/master
Commit: d75a1fde287eb95e05106c9a6583aea7d7cf6f97
Parents: 654b714
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 20 13:26:29 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 20 13:26:29 2017 +0100

----------------------------------------------------------------------
 fastjson-1.2.41/pom.xml                         | 119 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  15 ---
 fastjson-1.2.43/pom.xml                         | 119 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  15 +++
 pom.xml                                         |   1 +
 5 files changed, 135 insertions(+), 134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/d75a1fde/fastjson-1.2.41/pom.xml
----------------------------------------------------------------------
diff --git a/fastjson-1.2.41/pom.xml b/fastjson-1.2.41/pom.xml
deleted file mode 100644
index b8a0d3f..0000000
--- a/fastjson-1.2.41/pom.xml
+++ /dev/null
@@ -1,119 +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.fastjson</artifactId>
-    <version>1.2.41_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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <pkgGroupId>com.alibaba</pkgGroupId>
-        <pkgArtifactId>fastjson</pkgArtifactId>
-        <pkgVersion>1.2.41</pkgVersion>
-        <servicemix.osgi.export>
-        com.alibaba.fastjson*;version=1.2.41;-split-package:=merge-first
-        </servicemix.osgi.export>
-        <servicemix.osgi.import.pkg>
-        </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>
-                                    <excludes>
-                                        <exclude>**/*</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.3</version>
-                <extensions>true</extensions>
-                <inherited>false</inherited>
-                <configuration>
-                   <instructions>
-                       <Export-Package>${servicemix.osgi.export}</Export-Package>
-                       <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
-                       <Bundle-NativeCode>*</Bundle-NativeCode>
-                   </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/d75a1fde/fastjson-1.2.41/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/fastjson-1.2.41/src/main/resources/OSGI-INF/bundle.info b/fastjson-1.2.41/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 4c59c10..0000000
--- a/fastjson-1.2.41/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,15 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Mustache can be used for HTML, config files, source code - anything. It works by expanding tags in a template using values 
-    provided in a hash or object.
-
-    We call it "logic-less" because there are no if statements, else clauses, or for loops. Instead there are only tags. Some 
-    tags are replaced with a value, some nothing, and others a series of values.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://mustache.github.io/\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/d75a1fde/fastjson-1.2.43/pom.xml
----------------------------------------------------------------------
diff --git a/fastjson-1.2.43/pom.xml b/fastjson-1.2.43/pom.xml
new file mode 100644
index 0000000..bc74d1d
--- /dev/null
+++ b/fastjson-1.2.43/pom.xml
@@ -0,0 +1,119 @@
+<?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.fastjson</artifactId>
+    <version>1.2.43_1-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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+    <tag>HEAD</tag>
+  </scm>
+
+    <properties>
+        <pkgGroupId>com.alibaba</pkgGroupId>
+        <pkgArtifactId>fastjson</pkgArtifactId>
+        <pkgVersion>1.2.43</pkgVersion>
+        <servicemix.osgi.export>
+        com.alibaba.fastjson*;version=1.2.43;-split-package:=merge-first
+        </servicemix.osgi.export>
+        <servicemix.osgi.import.pkg>
+        </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>
+                                    <excludes>
+                                        <exclude>**/*</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>false</inherited>
+                <configuration>
+                   <instructions>
+                       <Export-Package>${servicemix.osgi.export}</Export-Package>
+                       <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
+                       <Bundle-NativeCode>*</Bundle-NativeCode>
+                   </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/d75a1fde/fastjson-1.2.43/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/fastjson-1.2.43/src/main/resources/OSGI-INF/bundle.info b/fastjson-1.2.43/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..4c59c10
--- /dev/null
+++ b/fastjson-1.2.43/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,15 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Mustache can be used for HTML, config files, source code - anything. It works by expanding tags in a template using values 
+    provided in a hash or object.
+
+    We call it "logic-less" because there are no if statements, else clauses, or for loops. Instead there are only tags. Some 
+    tags are replaced with a value, some nothing, and others a series of values.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://mustache.github.io/\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/d75a1fde/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e3e624..04800e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <modules>
         <module>okhttp-3.9.1</module>
         <module>influxdb-java-2.8</module>
+        <module>fastjson-1.2.43</module>
     </modules>
 
 </project>


[3/5] servicemix-bundles git commit: [SM-3571] Create OSGi bundle for Spark-java 2.7.1

Posted by ac...@apache.org.
[SM-3571] Create OSGi bundle for Spark-java 2.7.1


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/5edea013
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5edea013
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5edea013

Branch: refs/heads/master
Commit: 5edea013c9d2842e1a43126e4eb408b434108d0b
Parents: d75a1fd
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 20 13:35:56 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 20 13:35:56 2017 +0100

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 sparkjava-core-2.7.0/pom.xml                    | 121 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  11 --
 sparkjava-core-2.7.1/pom.xml                    | 121 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 5 files changed, 133 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5edea013/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04800e8..f4ec8b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
         <module>okhttp-3.9.1</module>
         <module>influxdb-java-2.8</module>
         <module>fastjson-1.2.43</module>
+        <module>sparkjava-core-2.7.1</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5edea013/sparkjava-core-2.7.0/pom.xml
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.0/pom.xml b/sparkjava-core-2.7.0/pom.xml
deleted file mode 100644
index d697b2e..0000000
--- a/sparkjava-core-2.7.0/pom.xml
+++ /dev/null
@@ -1,121 +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.sparkjava-core</artifactId>
-    <version>2.7.0_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-
-    <scm>
-        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <pkgGroupId>com.sparkjava</pkgGroupId>
-        <pkgArtifactId>spark-core</pkgArtifactId>
-        <pkgVersion>2.7.0</pkgVersion>
-    </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>
-				    <excludes>
-					<exclude>**/*</exclude>
-				    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.3</version>
-                <extensions>true</extensions>
-                <inherited>false</inherited>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>sparkjava</Bundle-Name>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-			   spark.*;version="${pkgVersion}";-split-package:=merge-first
-                        </Export-Package>
-                        <Import-Package>
-			   javax.servlet*;version="[2,4)",
-                           org.eclipse.jetty*;version="[8,10)",
-                           *
-			</Import-Package>
-                        <Bundle-NativeCode>*</Bundle-NativeCode>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5edea013/sparkjava-core-2.7.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.0/src/main/resources/OSGI-INF/bundle.info b/sparkjava-core-2.7.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index bef47ce..0000000
--- a/sparkjava-core-2.7.0/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    A Sinatra inspired java web framework
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://sparkjava.com/\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5edea013/sparkjava-core-2.7.1/pom.xml
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.1/pom.xml b/sparkjava-core-2.7.1/pom.xml
new file mode 100644
index 0000000..29d1f03
--- /dev/null
+++ b/sparkjava-core-2.7.1/pom.xml
@@ -0,0 +1,121 @@
+<?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.sparkjava-core</artifactId>
+    <version>2.7.1_1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+
+    <scm>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+    <tag>HEAD</tag>
+  </scm>
+
+    <properties>
+        <pkgGroupId>com.sparkjava</pkgGroupId>
+        <pkgArtifactId>spark-core</pkgArtifactId>
+        <pkgVersion>2.7.1</pkgVersion>
+    </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>
+				    <excludes>
+					<exclude>**/*</exclude>
+				    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>false</inherited>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>sparkjava</Bundle-Name>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+			   spark.*;version="${pkgVersion}";-split-package:=merge-first
+                        </Export-Package>
+                        <Import-Package>
+			   javax.servlet*;version="[2,4)",
+                           org.eclipse.jetty*;version="[8,10)",
+                           *
+			</Import-Package>
+                        <Bundle-NativeCode>*</Bundle-NativeCode>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5edea013/sparkjava-core-2.7.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.1/src/main/resources/OSGI-INF/bundle.info b/sparkjava-core-2.7.1/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..bef47ce
--- /dev/null
+++ b/sparkjava-core-2.7.1/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    A Sinatra inspired java web framework
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://sparkjava.com/\u001B[0m