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/07/25 09:09:28 UTC
[1/3] servicemix-bundles git commit: [SM-3765] Create OSGi bundle for
Influxdb-java 2.11
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 1e37e0115 -> 5505a7718
[SM-3765] Create OSGi bundle for Influxdb-java 2.11
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/f3843941
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/f3843941
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/f3843941
Branch: refs/heads/master
Commit: f38439418c812e61759388353cb794fb04434048
Parents: 1e37e01
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jul 25 11:03:22 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jul 25 11:03:22 2018 +0200
----------------------------------------------------------------------
influxdb-java-2.10/pom.xml | 117 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 --
influxdb-java-2.11/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/f3843941/influxdb-java-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/influxdb-java-2.10/pom.xml b/influxdb-java-2.10/pom.xml
deleted file mode 100644
index e46c4dc..0000000
--- a/influxdb-java-2.10/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.10_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.10</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/f3843941/influxdb-java-2.10/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/influxdb-java-2.10/src/main/resources/OSGI-INF/bundle.info b/influxdb-java-2.10/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 7650efe..0000000
--- a/influxdb-java-2.10/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/f3843941/influxdb-java-2.11/pom.xml
----------------------------------------------------------------------
diff --git a/influxdb-java-2.11/pom.xml b/influxdb-java-2.11/pom.xml
new file mode 100644
index 0000000..ecc3b31
--- /dev/null
+++ b/influxdb-java-2.11/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.11_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.11</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/f3843941/influxdb-java-2.11/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/influxdb-java-2.11/src/main/resources/OSGI-INF/bundle.info b/influxdb-java-2.11/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..7650efe
--- /dev/null
+++ b/influxdb-java-2.11/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/f3843941/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94b04a1..e1e2cf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
<module>kafka_2.11-1.1.1</module>
<module>kafka-clients-1.1.1</module>
<module>kafka-streams-1.1.1</module>
+ <module>influxdb-java-2.11</module>
</modules>
</project>
[2/3] servicemix-bundles git commit: [SM-3766] Create OSGi bundle for
OkHttp client to version 3.11.0
Posted by ac...@apache.org.
[SM-3766] Create OSGi bundle for OkHttp client to version 3.11.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/2e2445af
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/2e2445af
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/2e2445af
Branch: refs/heads/master
Commit: 2e2445afada8e4f22cfff12d2cbe9e8363196f6a
Parents: f384394
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jul 25 11:06:09 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jul 25 11:06:09 2018 +0200
----------------------------------------------------------------------
okhttp-3.10.0/pom.xml | 187 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 --
okhttp-3.11.0/pom.xml | 187 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
5 files changed, 199 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2e2445af/okhttp-3.10.0/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.10.0/pom.xml b/okhttp-3.10.0/pom.xml
deleted file mode 100644
index ac6a045..0000000
--- a/okhttp-3.10.0/pom.xml
+++ /dev/null
@@ -1,187 +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.okhttp</artifactId>
- <version>3.10.0_3-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.10.0</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,
- android.os.*;resolution:=optional,
- org.conscrypt.*;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/2e2445af/okhttp-3.10.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okhttp-3.10.0/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.10.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index b06d196..0000000
--- a/okhttp-3.10.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}\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/2e2445af/okhttp-3.11.0/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.11.0/pom.xml b/okhttp-3.11.0/pom.xml
new file mode 100644
index 0000000..5251c9c
--- /dev/null
+++ b/okhttp-3.11.0/pom.xml
@@ -0,0 +1,187 @@
+<?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.11.0_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.11.0</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,
+ android.os.*;resolution:=optional,
+ org.conscrypt.*;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/2e2445af/okhttp-3.11.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okhttp-3.11.0/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.11.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..b06d196
--- /dev/null
+++ b/okhttp-3.11.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}\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/2e2445af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e1e2cf2..4a5b8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
<module>kafka-clients-1.1.1</module>
<module>kafka-streams-1.1.1</module>
<module>influxdb-java-2.11</module>
+ <module>okhttp-3.11.0</module>
</modules>
</project>
[3/3] servicemix-bundles git commit: [SM-3767] Create OSGi bundle for
Okio 1.15.0
Posted by ac...@apache.org.
[SM-3767] Create OSGi bundle for Okio 1.15.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/5505a771
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5505a771
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5505a771
Branch: refs/heads/master
Commit: 5505a771867751f7f1ca4cad40764d944c0563f2
Parents: 2e2445a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jul 25 11:08:26 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jul 25 11:08:26 2018 +0200
----------------------------------------------------------------------
okio-1.14.0/pom.xml | 107 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 12 ---
okio-1.15.0/pom.xml | 107 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 12 +++
pom.xml | 1 +
5 files changed, 120 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5505a771/okio-1.14.0/pom.xml
----------------------------------------------------------------------
diff --git a/okio-1.14.0/pom.xml b/okio-1.14.0/pom.xml
deleted file mode 100644
index f5a291d..0000000
--- a/okio-1.14.0/pom.xml
+++ /dev/null
@@ -1,107 +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.okio</artifactId>
- <version>1.14.0_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.squareup.okio</pkgGroupId>
- <pkgArtifactId>okio</pkgArtifactId>
- <pkgVersion>1.14.0</pkgVersion>
- <servicemix.osgi.export.pkg>
- okio
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- *
- </servicemix.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>okio</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>okio</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5505a771/okio-1.14.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okio-1.14.0/src/main/resources/OSGI-INF/bundle.info b/okio-1.14.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index b24b209..0000000
--- a/okio-1.14.0/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}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
- Okio is a new library that complements java.io and java.nio to make it much
- easier to access, store, and process your data.
-
-\u001B[1mSEE ALSO\u001B[0m
- \u001B[36mhttps://github.com/square/okio\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5505a771/okio-1.15.0/pom.xml
----------------------------------------------------------------------
diff --git a/okio-1.15.0/pom.xml b/okio-1.15.0/pom.xml
new file mode 100644
index 0000000..3f50522
--- /dev/null
+++ b/okio-1.15.0/pom.xml
@@ -0,0 +1,107 @@
+<?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.okio</artifactId>
+ <version>1.15.0_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.okio</pkgGroupId>
+ <pkgArtifactId>okio</pkgArtifactId>
+ <pkgVersion>1.15.0</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ okio
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ *
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okio</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okio</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5505a771/okio-1.15.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okio-1.15.0/src/main/resources/OSGI-INF/bundle.info b/okio-1.15.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..b24b209
--- /dev/null
+++ b/okio-1.15.0/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,12 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ Okio is a new library that complements java.io and java.nio to make it much
+ easier to access, store, and process your data.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttps://github.com/square/okio\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5505a771/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a5b8c6..c09f456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
<module>kafka-streams-1.1.1</module>
<module>influxdb-java-2.11</module>
<module>okhttp-3.11.0</module>
+ <module>okio-1.15.0</module>
</modules>
</project>