You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2015/12/14 04:07:39 UTC

[1/2] servicemix-bundles git commit: [SM-2766] Create OSGi bundle for docker-java 2.1.3

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 7a72f8cb0 -> 984435efd


[SM-2766] Create OSGi bundle for docker-java 2.1.3


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

Branch: refs/heads/master
Commit: 83cb7fdefa0fc0ca020a6adeff0ecfb2e3e0e0fe
Parents: 5ed34c6
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Dec 10 12:29:22 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Dec 13 14:00:46 2015 +0100

----------------------------------------------------------------------
 docker-java-2.1.3/pom.xml                       | 107 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 3 files changed, 119 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/83cb7fde/docker-java-2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/docker-java-2.1.3/pom.xml b/docker-java-2.1.3/pom.xml
new file mode 100644
index 0000000..a5a637e
--- /dev/null
+++ b/docker-java-2.1.3/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>12</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.docker-java</artifactId>
+    <version>2.1.3_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.github.docker-java</pkgGroupId>
+        <pkgArtifactId>docker-java</pkgArtifactId>
+        <pkgVersion>2.1.3</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            com.github.dockerjava
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            *
+        </servicemix.osgi.import.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>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </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/83cb7fde/docker-java-2.1.3/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/docker-java-2.1.3/src/main/resources/OSGI-INF/bundle.info b/docker-java-2.1.3/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..dac604f
--- /dev/null
+++ b/docker-java-2.1.3/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
+    docker-java is Java API client for Docker. Supports a subset of the Docker Client API v1.16, Docker Server version 1.4.1
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttps://github.com/docker-java/docker-java\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/83cb7fde/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de675e4..3975d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <module>facebook4j-2.4.0</module>
         <module>facebook4j-2.4.1</module>
         <module>docker-java-2.1.2</module>
+        <module>docker-java-2.1.3</module>
         <module>aws-java-sdk-1.10.38</module>
         <module>aws-java-sdk-1.10.39</module>
         <module>elasticsearch-2.0.1</module>


[2/2] servicemix-bundles git commit: Merge branch 'SM-2766' of https://github.com/oscerd/servicemix-bundles

Posted by ff...@apache.org.
Merge branch 'SM-2766' of https://github.com/oscerd/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/984435ef
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/984435ef
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/984435ef

Branch: refs/heads/master
Commit: 984435efdeaec53bfd8bcf9a423554eacd4a5284
Parents: 7a72f8c 83cb7fd
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Dec 14 11:05:01 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Dec 14 11:05:01 2015 +0800

----------------------------------------------------------------------
 docker-java-2.1.3/pom.xml                       | 107 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 3 files changed, 119 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/984435ef/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 348f83d,3975d21..c48effa
--- a/pom.xml
+++ b/pom.xml
@@@ -46,9 -46,9 +46,10 @@@
          <module>facebook4j-2.4.0</module>
          <module>facebook4j-2.4.1</module>
          <module>docker-java-2.1.2</module>
+         <module>docker-java-2.1.3</module>
          <module>aws-java-sdk-1.10.38</module>
          <module>aws-java-sdk-1.10.39</module>
 +        <module>aws-java-sdk-1.10.40</module>
          <module>elasticsearch-2.0.1</module>
          <module>gae-1.9.30</module>
      </modules>