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 2018/09/26 08:43:50 UTC

[1/2] servicemix-bundles git commit: Cleanup for a new release cycle

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master ad6531c89 -> 29bc305fb


Cleanup for a new release cycle


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

Branch: refs/heads/master
Commit: a607c13a6d6fbc58fdb551757a2e66a9a180ff33
Parents: ad6531c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Sep 26 10:39:19 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Sep 26 10:39:19 2018 +0200

----------------------------------------------------------------------
 pom.xml | 70 ------------------------------------------------------------
 1 file changed, 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/a607c13a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ca9039..8366545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,76 +42,6 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
-       <module>influxdb-java-2.13</module>
-       <module>facebook4j-2.4.12</module>
-       <module>grpc-1.15.0</module>
-       <module>derby-10.14.2.0</module>
-       <module>spring-aop-4.3.19.RELEASE</module>
-				<module>spring-aspects-4.3.19.RELEASE</module>
-				<module>spring-beans-4.3.19.RELEASE</module>
-				<module>spring-context-4.3.19.RELEASE</module>
-				<module>spring-context-support-4.3.19.RELEASE</module>
-				<module>spring-core-4.3.19.RELEASE</module>
-				<module>spring-expression-4.3.19.RELEASE</module>
-				<module>spring-instrument-4.3.19.RELEASE</module>
-				<module>spring-jdbc-4.3.19.RELEASE</module>
-				<module>spring-jms-4.3.19.RELEASE</module>
-				<module>spring-messaging-4.3.19.RELEASE</module>
-				<module>spring-orm-4.3.19.RELEASE</module>
-				<module>spring-oxm-4.3.19.RELEASE</module>
-				<module>spring-test-4.3.19.RELEASE</module>
-				<module>spring-tx-4.3.19.RELEASE</module>
-				<module>spring-web-4.3.19.RELEASE</module>
-				<module>spring-webmvc-4.3.19.RELEASE</module>
-				<module>spring-webmvc-portlet-4.3.19.RELEASE</module>
-				<module>spring-websocket-4.3.19.RELEASE</module>
-				<module>spring-aop-5.0.9.RELEASE</module>
-				<module>spring-aspects-5.0.9.RELEASE</module>
-				<module>spring-beans-5.0.9.RELEASE</module>
-				<module>spring-context-5.0.9.RELEASE</module>
-				<module>spring-context-support-5.0.9.RELEASE</module>
-				<module>spring-core-5.0.9.RELEASE</module>
-				<module>spring-expression-5.0.9.RELEASE</module>
-				<module>spring-instrument-5.0.9.RELEASE</module>
-				<module>spring-jdbc-5.0.9.RELEASE</module>
-				<module>spring-jms-5.0.9.RELEASE</module>
-				<module>spring-messaging-5.0.9.RELEASE</module>
-				<module>spring-orm-5.0.9.RELEASE</module>
-				<module>spring-oxm-5.0.9.RELEASE</module>
-				<module>spring-test-5.0.9.RELEASE</module>
-				<module>spring-tx-5.0.9.RELEASE</module>
-				<module>spring-web-5.0.9.RELEASE</module>
-				<module>spring-webmvc-5.0.9.RELEASE</module>
-				<module>spring-websocket-5.0.9.RELEASE</module>
-				<module>spring-security-acl-5.0.8.RELEASE</module>
-				<module>spring-security-aspects-5.0.8.RELEASE</module>
-				<module>spring-security-cas-5.0.8.RELEASE</module>
-				<module>spring-security-config-5.0.8.RELEASE</module>
-        <module>spring-security-core-5.0.8.RELEASE</module>
-        <module>spring-security-crypto-5.0.8.RELEASE</module>
-        <module>spring-security-data-5.0.8.RELEASE</module>
-        <module>spring-security-ldap-5.0.8.RELEASE</module>
-        <module>spring-security-messaging-5.0.8.RELEASE</module>
-        <module>spring-security-oauth2-client-5.0.8.RELEASE</module>
-        <module>spring-security-oauth2-core-5.0.8.RELEASE</module>
-        <module>spring-security-oauth2-jose-5.0.8.RELEASE</module>
-        <module>spring-security-remoting-5.0.8.RELEASE</module>
-        <module>spring-security-taglibs-5.0.8.RELEASE</module>
-        <module>spring-security-test-5.0.8.RELEASE</module>
-        <module>spring-security-web-5.0.8.RELEASE</module>
-        <module>qpid-6.1.7</module>
-        <module>spring-ws-core-3.0.3.RELEASE</module>
-        <module>spring-ws-security-3.0.3.RELEASE</module>
-        <module>spring-ws-support-3.0.3.RELEASE</module>
-        <module>spring-ws-test-3.0.3.RELEASE</module>
-        <module>digitalocean-api-client-2.16</module>
-        <module>libphonenumber-8.9.13</module>
-        <module>spring-data-commons-2.0.10.RELEASE</module>
-        <module>spring-data-keyvalue-2.0.10.RELEASE</module>
-        <module>spring-data-redis-2.0.10.RELEASE</module>
-        <module>elasticsearch-6.4.0</module>
-        <module>elasticsearch-client-6.4.0</module>
-        <module>bcpg-jdk15on-1.60</module>
     </modules>
 
 </project>


[2/2] servicemix-bundles git commit: [SM-3805] Create OSGi bundle for Spark 2.8.0

Posted by ac...@apache.org.
[SM-3805] Create OSGi bundle for Spark 2.8.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/29bc305f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/29bc305f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/29bc305f

Branch: refs/heads/master
Commit: 29bc305fb1286977ab7d34bcca21cf99b6ad56dd
Parents: a607c13
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Sep 26 10:43:05 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Sep 26 10:43:05 2018 +0200

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 sparkjava-core-2.7.2/pom.xml                    | 120 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  11 --
 sparkjava-core-2.8.0/pom.xml                    | 120 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 5 files changed, 132 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/29bc305f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8366545..7663b45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
+       <module>sparkjava-core-2.8.0</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/29bc305f/sparkjava-core-2.7.2/pom.xml
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.2/pom.xml b/sparkjava-core-2.7.2/pom.xml
deleted file mode 100644
index d17dc83..0000000
--- a/sparkjava-core-2.7.2/pom.xml
+++ /dev/null
@@ -1,120 +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.2_3-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.2</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>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/29bc305f/sparkjava-core-2.7.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.2/src/main/resources/OSGI-INF/bundle.info b/sparkjava-core-2.7.2/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index bef47ce..0000000
--- a/sparkjava-core-2.7.2/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/29bc305f/sparkjava-core-2.8.0/pom.xml
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.8.0/pom.xml b/sparkjava-core-2.8.0/pom.xml
new file mode 100644
index 0000000..d895ecb
--- /dev/null
+++ b/sparkjava-core-2.8.0/pom.xml
@@ -0,0 +1,120 @@
+<?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.8.0_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.8.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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/29bc305f/sparkjava-core-2.8.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.8.0/src/main/resources/OSGI-INF/bundle.info b/sparkjava-core-2.8.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..bef47ce
--- /dev/null
+++ b/sparkjava-core-2.8.0/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