You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2016/03/23 17:20:46 UTC

[2/2] servicemix-bundles git commit: SM-2897 - This closes #64

SM-2897 - This closes #64


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

Branch: refs/heads/master
Commit: bafeb8a40b462f321772222b8bea2b059d5419f5
Parents: 9f3b961 061cf8b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Mar 23 17:20:06 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Mar 23 17:20:06 2016 +0100

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 retrofit-2.0.0/pom.xml                          | 344 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 3 files changed, 356 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/bafeb8a4/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9e2111a,b3f0039..94501fa
--- a/pom.xml
+++ b/pom.xml
@@@ -57,15 -55,7 +57,16 @@@
          <module>solr-solrj-5.5.0</module>
          <module>jedis-2.8.0</module>
          <module>aws-java-sdk-1.10.60</module>
 +        <module>xstream-1.4.9</module>
 +        <module>elasticsearch-2.2.1</module>
 +        <module>facebook4j-2.4.3</module>
 +        <module>gson-2.1</module>
 +        <module>ironmq-3.0.3</module>
 +        <module>okio-1.6.0</module>
 +        <module>okhttp-2.7.5</module>
 +        <module>okhttp-3.2.0</module>
 +        <module>retrofit-1.9.0</module>
+         <module>retrofit-2.0.0</module>
      </modules>
  
  </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/bafeb8a4/retrofit-2.0.0/pom.xml
----------------------------------------------------------------------
diff --cc retrofit-2.0.0/pom.xml
index 0000000,dc00a55..1e0a143
mode 000000,100644..100644
--- a/retrofit-2.0.0/pom.xml
+++ b/retrofit-2.0.0/pom.xml
@@@ -1,0 -1,344 +1,344 @@@
+ <?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>12</version>
+         <relativePath>../bundles-pom/pom.xml</relativePath>
+     </parent>
+ 
+     <groupId>org.apache.servicemix.bundles</groupId>
+     <artifactId>org.apache.servicemix.bundles.retrofit</artifactId>
+     <version>2.0.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.retrofit2</pkgGroupId>
+         <pkgArtifactId>retrofit</pkgArtifactId>
+         <pkgVersion>2.0.0</pkgVersion>
+         <servicemix.osgi.export.pkg>
 -            retrofit2.*;version=${pkgVersion};-split-package:=merge-first
++            retrofit2
+         </servicemix.osgi.export.pkg>
+         <servicemix.osgi.import.pkg>
+             org.apache.http.*;resolution:=optional,
+             android.*;resolution:=optional,
+             com.fasterxml.jackson.*;resolution:=optional,
+             com.google.appengine.*;resolution:=optional,
+             com.google.gson.*;resolution:=optional,
+             com.google.protobuf.*;resolution:=optional,
+             com.google.common.util.concurrent.*;resolution:=optional,
+             com.squareup.wire.*;resolution:=optional,
+             com.squareup.moshi.*;resolution:=optional,
+             org.simpleframework.*;resolution:=optional,
+             rx.*;resolution:=optional,
+             okhttp3;version="[3.2,4)",
+             *
+         </servicemix.osgi.import.pkg>
+     </properties>
+ 
+     <dependencies>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>retrofit</artifactId>
+             <version>${pkgVersion}</version>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-jackson</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-moshi</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-protobuf</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-scalars</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-wire</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-simplexml</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-guava</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-java8</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-rxjava</artifactId>
+             <version>${pkgVersion}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>${pkgGroupId}</groupId>
+                     <artifactId>retrofit</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+ 
+         <!-- sources -->
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>retrofit</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-jackson</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-moshi</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-protobuf</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-scalars</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-wire</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>converter-simplexml</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-guava</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-java8</artifactId>
+             <version>${pkgVersion}</version>
+             <classifier>sources</classifier>
+             <optional>true</optional>
+         </dependency>
+         <dependency>
+             <groupId>${pkgGroupId}</groupId>
+             <artifactId>adapter-rxjava</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}:retrofit</include>
+                                     <include>${pkgGroupId}:converter-jackson</include>
+                                     <include>${pkgGroupId}:converter-moshi</include>
+                                     <include>${pkgGroupId}:converter-protobuf</include>
+                                     <include>${pkgGroupId}:converter-scalars</include>
+                                     <include>${pkgGroupId}:converter-wire</include>
+                                     <include>${pkgGroupId}:converter-simplexml</include>
+                                     <include>${pkgGroupId}:adapter-guava</include>
+                                     <include>${pkgGroupId}:adapter-java8</include>
+                                     <include>${pkgGroupId}:adapter-rxjava</include>
+                                 </includes>
+                             </artifactSet>
+                             <filters>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:retrofit</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-jackson</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-moshi</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-protobuf</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-scalars</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-wire</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:converter-simplexml</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:adapter-guava</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:adapter-java8</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                                 <filter>
+                                     <artifact>${pkgGroupId}:adapter-rxjava</artifact>
+                                     <excludes>
+                                         <exclude>**</exclude>
+                                     </excludes>
+                                 </filter>
+                             </filters>
+                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                             <createDependencyReducedPom>true</createDependencyReducedPom>
+                         </configuration>
+                     </execution>
+                 </executions>
+             </plugin>
+         </plugins>
+     </build>
+ </project>