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 2016/04/22 08:59:29 UTC
[1/2] servicemix-bundles git commit: [SM-2949]add hystrix 1.5.2 bundle
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 425b5674f -> 79c494b1f
[SM-2949]add hystrix 1.5.2 bundle
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/f0b53ac7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/f0b53ac7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/f0b53ac7
Branch: refs/heads/master
Commit: f0b53ac71d4da153908cafab2a6045ad353c0091
Parents: 127aec7
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Apr 22 14:58:25 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Apr 22 14:58:25 2016 +0800
----------------------------------------------------------------------
hystrix-1.5.2/pom.xml | 126 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 13 ++
pom.xml | 1 +
3 files changed, 140 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/f0b53ac7/hystrix-1.5.2/pom.xml
----------------------------------------------------------------------
diff --git a/hystrix-1.5.2/pom.xml b/hystrix-1.5.2/pom.xml
new file mode 100644
index 0000000..df08909
--- /dev/null
+++ b/hystrix-1.5.2/pom.xml
@@ -0,0 +1,126 @@
+<?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.hystrix</artifactId>
+ <version>1.5.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.netflix.hystrix</pkgGroupId>
+ <pkgArtifactId>hystrix-core</pkgArtifactId>
+ <pkgVersion>1.5.2</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ com.netflix.hystrix
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org,
+ javax.management,
+ javax.sql;resolution:=optional,
+ org.apache.commons.configuration*;resolution:=optional,
+ org.junit;resolution:=optional,
+ org.slf4j;resolution:=optional,
+ sun.misc;resolution:=optional,
+ org.HdrHistogram;resolution:=optional,
+ rx*
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ com.netflix.config*
+ </servicemix.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ <version>2.1.7</version>
+ </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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/f0b53ac7/hystrix-1.5.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/hystrix-1.5.2/src/main/resources/OSGI-INF/bundle.info b/hystrix-1.5.2/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..bb11f6d
--- /dev/null
+++ b/hystrix-1.5.2/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,13 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ Hystrix is a latency and fault tolerance library designed to isolate points of access to remote systems, services
+ and 3rd party libraries, stop cascading failure and enable resilience in complex distributed systems where
+ failure is inevitable.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttps://github.com/Netflix/Hystrix\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/f0b53ac7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b26fd1..60303ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
<modules>
<!-- add modules for all bundles to released in the next batch here -->
<module>elasticsearch-2.3.0</module>
+ <module>hystrix-1.5.2</module>
<module>hystrix-1.4.26</module>
<module>hystrix-1.4.23</module>
<module>hystrix-1.3.13</module>
[2/2] servicemix-bundles git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/servicemix-bundles
Posted by ff...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/79c494b1
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/79c494b1
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/79c494b1
Branch: refs/heads/master
Commit: 79c494b1fa33cb4bfd6766708f4be4fa508462b1
Parents: f0b53ac 425b567
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Apr 22 14:58:57 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Apr 22 14:58:57 2016 +0800
----------------------------------------------------------------------
jt400-9.0/pom.xml | 118 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 21 ++++
pom.xml | 3 +-
3 files changed, 141 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/79c494b1/pom.xml
----------------------------------------------------------------------