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/02/27 07:49:51 UTC
[1/2] servicemix-bundles git commit: [SM-3640] Create OSGi bundle for
Zxing 3.3.2
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 6689e67cd -> 7c8120a3d
[SM-3640] Create OSGi bundle for Zxing 3.3.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/4efc5f0c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/4efc5f0c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/4efc5f0c
Branch: refs/heads/master
Commit: 4efc5f0c83006a41327cfb725f10c6875c6df051
Parents: 6689e67
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 27 08:44:06 2018 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 27 08:44:06 2018 +0100
----------------------------------------------------------------------
pom.xml | 1 +
zxing-3.3.1/pom.xml | 124 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 12 --
zxing-3.3.2/pom.xml | 124 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 12 ++
5 files changed, 137 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/4efc5f0c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 79a11e7..c318445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
<module>libphonenumber-8.8.11</module>
<module>grpc-1.10.0</module>
<module>azure-storage-7.0.0</module>
+ <module>zxing-3.3.2</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/4efc5f0c/zxing-3.3.1/pom.xml
----------------------------------------------------------------------
diff --git a/zxing-3.3.1/pom.xml b/zxing-3.3.1/pom.xml
deleted file mode 100644
index fdf8114..0000000
--- a/zxing-3.3.1/pom.xml
+++ /dev/null
@@ -1,124 +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.zxing</artifactId>
- <version>3.3.1_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.google.zxing</pkgGroupId>
- <pkgArtifactId>zxing</pkgArtifactId>
- <pkgVersion>3.3.1</pkgVersion>
- <servicemix.osgi.export.pkg>
- com.google.zxing
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- *
- </servicemix.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>core</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>javase</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>core</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>javase</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}:core</include>
- <include>${pkgGroupId}:javase</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:core</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>${pkgGroupId}:javase</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/4efc5f0c/zxing-3.3.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/zxing-3.3.1/src/main/resources/OSGI-INF/bundle.info b/zxing-3.3.1/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index cf4a101..0000000
--- a/zxing-3.3.1/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}/core\u001B[0m
- \u001B[33mmvn:${pkgGroupId}/javase\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
- ZXing ("zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library implemented in Java, with ports to other languages.
-
-\u001B[1mSEE ALSO\u001B[0m
- \u001B[36mhttps://github.com/zxing/zxing/\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/4efc5f0c/zxing-3.3.2/pom.xml
----------------------------------------------------------------------
diff --git a/zxing-3.3.2/pom.xml b/zxing-3.3.2/pom.xml
new file mode 100644
index 0000000..98cf256
--- /dev/null
+++ b/zxing-3.3.2/pom.xml
@@ -0,0 +1,124 @@
+<?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.zxing</artifactId>
+ <version>3.3.2_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.google.zxing</pkgGroupId>
+ <pkgArtifactId>zxing</pkgArtifactId>
+ <pkgVersion>3.3.2</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ com.google.zxing
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ *
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>core</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>javase</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>core</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>javase</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}:core</include>
+ <include>${pkgGroupId}:javase</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:core</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:javase</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/4efc5f0c/zxing-3.3.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/zxing-3.3.2/src/main/resources/OSGI-INF/bundle.info b/zxing-3.3.2/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..cf4a101
--- /dev/null
+++ b/zxing-3.3.2/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,12 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/core\u001B[0m
+ \u001B[33mmvn:${pkgGroupId}/javase\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ ZXing ("zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library implemented in Java, with ports to other languages.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttps://github.com/zxing/zxing/\u001B[0m
[2/2] servicemix-bundles git commit: [SM-3641] Create OSGi bundle for
OkHttp client 3.10.0
Posted by ac...@apache.org.
[SM-3641] Create OSGi bundle for OkHttp client 3.10.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/7c8120a3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/7c8120a3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/7c8120a3
Branch: refs/heads/master
Commit: 7c8120a3dc0334abea973977646ff96259e69f9b
Parents: 4efc5f0
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Feb 27 08:47:02 2018 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Feb 27 08:47:02 2018 +0100
----------------------------------------------------------------------
okhttp-3.10.0/pom.xml | 186 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
3 files changed, 198 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7c8120a3/okhttp-3.10.0/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.10.0/pom.xml b/okhttp-3.10.0/pom.xml
new file mode 100644
index 0000000..a3f5a96
--- /dev/null
+++ b/okhttp-3.10.0/pom.xml
@@ -0,0 +1,186 @@
+<?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_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.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,
+ *
+ </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/7c8120a3/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
new file mode 100644
index 0000000..b06d196
--- /dev/null
+++ b/okhttp-3.10.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/7c8120a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c318445..7a01e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<module>grpc-1.10.0</module>
<module>azure-storage-7.0.0</module>
<module>zxing-3.3.2</module>
+ <module>okhttp-3.10.0</module>
</modules>
</project>