servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [2/2] servicemix-bundles git commit: SM-2893 - This closes #61
Date Wed, 23 Mar 2016 15:10:35 GMT
SM-2893 - This closes #61

Merge branch 'squareup-retrofit' of https://github.com/lburgazzoli/apache-servicemix-bundles


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

Branch: refs/heads/master
Commit: 9f3b96134431e1b023f981de7bf21670d3865bcb
Parents: 04f6e5c 8a65c2c
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Mar 23 16:09:42 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Mar 23 16:09:42 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/9f3b9613/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f4f4820,695531f..9e2111a
--- a/pom.xml
+++ b/pom.xml
@@@ -55,16 -53,7 +55,17 @@@
          <module>lucene-queryparser-5.5.0</module>
          <module>lucene-sandbox-5.5.0</module>
          <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>
      </modules>
  
  </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/9f3b9613/retrofit-1.9.0/pom.xml
----------------------------------------------------------------------
diff --cc retrofit-1.9.0/pom.xml
index 0000000,50c941e..d7a800a
mode 000000,100644..100644
--- a/retrofit-1.9.0/pom.xml
+++ b/retrofit-1.9.0/pom.xml
@@@ -1,0 -1,217 +1,217 @@@
+ <?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>1.9.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.retrofit</pkgGroupId>
+         <pkgArtifactId>retrofit</pkgArtifactId>
+         <pkgVersion>1.9.0</pkgVersion>
+         <servicemix.osgi.export.pkg>
 -            retrofit.*;version=${pkgVersion};-split-package:=merge-first
++            retrofit
+         </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.squareup.wire.*;resolution:=optional,
+             org.simpleframework.*;resolution:=optional,
+             rx.*;resolution:=optional,
+             com.squareup.okhttp;version="[2.2,3)",
+             *
+         </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-protobuf</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>
+ 
+         <!-- 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-protobuf</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>
+     </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-protobuf</include>
+                                     <include>${pkgGroupId}:converter-wire</include>
+                                     <include>${pkgGroupId}:converter-simplexml</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-protobuf</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>
+                             </filters>
+                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                             <createDependencyReducedPom>true</createDependencyReducedPom>
+                         </configuration>
+                     </execution>
+                 </executions>
+             </plugin>
+         </plugins>
+     </build>
+ </project>


Mime
View raw message