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/06/22 07:21:18 UTC
[1/3] servicemix-bundles git commit: [SM-3384] Quartz bundle would be
better if more dependencies were optional. Thanks to Paul Illingworth for the
patch.
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 797f8622c -> cf47b2900
[SM-3384] Quartz bundle would be better if more dependencies were optional. Thanks to Paul Illingworth for the patch.
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/4f3a5793
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/4f3a5793
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/4f3a5793
Branch: refs/heads/master
Commit: 4f3a5793e8d98e57ed1e3e1ebbefbfa9d3de5eef
Parents: 797f862
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 22 09:06:47 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 22 09:06:47 2017 +0200
----------------------------------------------------------------------
quartz-2.3.0/pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/4f3a5793/quartz-2.3.0/pom.xml
----------------------------------------------------------------------
diff --git a/quartz-2.3.0/pom.xml b/quartz-2.3.0/pom.xml
index 8264f93..e0fd7bb 100644
--- a/quartz-2.3.0/pom.xml
+++ b/quartz-2.3.0/pom.xml
@@ -49,20 +49,20 @@
org.quartz
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- commonj.work,
- oracle.sql,
- org.jboss.logging,
- org.jboss.naming,
- org.jboss.system,
- weblogic.jdbc.jts,
- weblogic.jdbc.vendor.oracle,
+ commonj.work;resolution:=optional,
+ oracle.sql;resolution:=optional,
+ org.jboss.logging;resolution:=optional,
+ org.jboss.naming;resolution:=optional,
+ org.jboss.system;resolution:=optional,
+ weblogic.jdbc.jts;resolution:=optional,
+ weblogic.jdbc.vendor.oracle;resolution:=optional,
javax.ejb;resolution:=optional,
javax.jms;resolution:=optional,
javax.mail*;resolution:=optional,
javax.rmi;resolution:=optional,
javax.naming*;resolution:=optional,
- javax.servlet*;resolution:=optional;version="[2.5,3)",
- javax.transaction*;resolution:=optional;version="[1,2)",
+ javax.servlet*;resolution:=;resolution:=optional,
+ javax.transaction*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.6,2)",
com.mchange.v2.c3p0*;resolution:=optional,
javax.management,
[3/3] servicemix-bundles git commit: [SM-3385] Create OSGi bundle for
OkHttp client 3.8.1
Posted by ac...@apache.org.
[SM-3385] Create OSGi bundle for OkHttp client 3.8.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/cf47b290
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/cf47b290
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/cf47b290
Branch: refs/heads/master
Commit: cf47b29007bc4bd6541f2a595ad64826c42a88f4
Parents: 051b8d5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 22 09:18:06 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 22 09:18:06 2017 +0200
----------------------------------------------------------------------
okhttp-3.8.1/pom.xml | 185 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
3 files changed, 197 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/cf47b290/okhttp-3.8.1/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.8.1/pom.xml b/okhttp-3.8.1/pom.xml
new file mode 100644
index 0000000..000fc6d
--- /dev/null
+++ b/okhttp-3.8.1/pom.xml
@@ -0,0 +1,185 @@
+<?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.okhttp</artifactId>
+ <version>3.8.1_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.squareup.okhttp3</pkgGroupId>
+ <pkgArtifactId>okhttp</pkgArtifactId>
+ <pkgVersion>3.8.1</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ okhttp3
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ okio;version="[1.11.0,2)",
+ org.apache.http.*;resolution:=optional,
+ android.util.*;resolution:=optional,
+ *
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp-urlconnection</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp-apache</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>logging-interceptor</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp-urlconnection</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp-apache</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>logging-interceptor</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}:okhttp</include>
+ <include>${pkgGroupId}:okhttp-urlconnection</include>
+ <include>${pkgGroupId}:okhttp-apache</include>
+ <include>${pkgGroupId}:logging-interceptor</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:okhttp</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:okhttp-urlconnection</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:okhttp-apache</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:logging-interceptor</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/cf47b290/okhttp-3.8.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okhttp-3.8.1/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.8.1/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..b06d196
--- /dev/null
+++ b/okhttp-3.8.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}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ An HTTP & HTTP/2 client for Android and Java applications.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://square.github.io/okhttp/\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/cf47b290/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c698fbe..be7f48f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<module>influxdb-java-2.6</module>
<module>orbitz-consul-client-0.15.1</module>
<module>quartz-2.3.0</module>
+ <module>okhttp-3.8.1</module>
</modules>
</project>
[2/3] servicemix-bundles git commit: [SM-3384] Add Quartz 2.3.0
bundle to the module list for next release
Posted by ac...@apache.org.
[SM-3384] Add Quartz 2.3.0 bundle to the module list for next release
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/051b8d5d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/051b8d5d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/051b8d5d
Branch: refs/heads/master
Commit: 051b8d5d283a6fdba6ae5bedc2df9cc7051fde4e
Parents: 4f3a579
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 22 09:07:37 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 22 09:07:37 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/051b8d5d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 549ff9d..c698fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<!-- add modules for all bundles to released in the next batch here -->
<module>influxdb-java-2.6</module>
<module>orbitz-consul-client-0.15.1</module>
+ <module>quartz-2.3.0</module>
</modules>
</project>