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/01/27 10:08:28 UTC
servicemix-bundles git commit: SM-2804 - Set snappy packages as
optional in avro bundles
Repository: servicemix-bundles
Updated Branches:
refs/heads/master a9b174048 -> 32d9c8cc7
SM-2804 - Set snappy packages as optional in avro 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/32d9c8cc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/32d9c8cc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/32d9c8cc
Branch: refs/heads/master
Commit: 32d9c8cc7e076eb07c83b16acc274dc7da8c357e
Parents: a9b1740
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 27 10:07:58 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 27 10:07:58 2016 +0100
----------------------------------------------------------------------
avro-1.5.3/pom.xml | 11 +++++++++--
avro-1.6.1/pom.xml | 11 +++++++++--
avro-1.6.3/pom.xml | 11 +++++++++--
avro-1.7.1/pom.xml | 11 +++++++++--
avro-1.7.2/pom.xml | 11 +++++++++--
avro-1.7.3/pom.xml | 11 +++++++++--
avro-1.7.4/pom.xml | 11 +++++++++--
avro-1.7.5/pom.xml | 11 +++++++++--
avro-1.7.6/pom.xml | 11 +++++++++--
avro-1.7.7/pom.xml | 11 +++++++++--
pom.xml | 10 ++++++++++
11 files changed, 100 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.5.3/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.5.3/pom.xml b/avro-1.5.3/pom.xml
index 464d8a3..84346d2 100644
--- a/avro-1.5.3/pom.xml
+++ b/avro-1.5.3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.7,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.6.1/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.6.1/pom.xml b/avro-1.6.1/pom.xml
index 7c35dc8..682bc17 100644
--- a/avro-1.6.1/pom.xml
+++ b/avro-1.6.1/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.6.3/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.6.3/pom.xml b/avro-1.6.3/pom.xml
index 601a668..1052435 100644
--- a/avro-1.6.3/pom.xml
+++ b/avro-1.6.3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.1/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.1/pom.xml b/avro-1.7.1/pom.xml
index 47e11c0..29c4493 100644
--- a/avro-1.7.1/pom.xml
+++ b/avro-1.7.1/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.2/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.2/pom.xml b/avro-1.7.2/pom.xml
index 2f9990e..29cc6dc 100644
--- a/avro-1.7.2/pom.xml
+++ b/avro-1.7.2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.3/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.3/pom.xml b/avro-1.7.3/pom.xml
index 204a628..f6c9f17 100644
--- a/avro-1.7.3/pom.xml
+++ b/avro-1.7.3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.4/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.4/pom.xml b/avro-1.7.4/pom.xml
index cad009a..c051a6c 100644
--- a/avro-1.7.4/pom.xml
+++ b/avro-1.7.4/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -46,7 +53,7 @@
<servicemix.osgi.import.pkg>
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.5/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.5/pom.xml b/avro-1.7.5/pom.xml
index 12d71b6..fd57a31 100644
--- a/avro-1.7.5/pom.xml
+++ b/avro-1.7.5/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>10</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -47,7 +54,7 @@
com.thoughtworks.paranamer;version="[2.3,3)",
org.apache.commons.compress*,
org.codehaus.jackson*;version="[1.8,2)",
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
sun.misc;resolution:=optional
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.6/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.6/pom.xml b/avro-1.7.6/pom.xml
index ad3f57a..2830a1c 100644
--- a/avro-1.7.6/pom.xml
+++ b/avro-1.7.6/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>11</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -48,7 +55,7 @@
org.apache.commons.compress*,
org.codehaus.jackson*;version="[1.8,2)",
org.slf4j;resolution:=optional,
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
sun.misc;resolution:=optional
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/avro-1.7.7/pom.xml
----------------------------------------------------------------------
diff --git a/avro-1.7.7/pom.xml b/avro-1.7.7/pom.xml
index 7d11958..1e7a24e 100644
--- a/avro-1.7.7/pom.xml
+++ b/avro-1.7.7/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>11</version>
+ <version>12</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -35,6 +35,13 @@
<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>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
@@ -48,7 +55,7 @@
org.apache.commons.compress*,
org.codehaus.jackson*;version="[1.8,2)",
org.slf4j;resolution:=optional,
- org.xerial.snappy;version="[1.0,2)",
+ org.xerial.snappy;version="[1.0,2)";resolution:=optional,
sun.misc;resolution:=optional
</servicemix.osgi.import.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32d9c8cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6761224..791284f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,16 @@
<module>spring-web-3.2.16.RELEASE</module>
<module>spring-webmvc-3.2.16.RELEASE</module>
<module>spring-webmvc-portlet-3.2.16.RELEASE</module>
+ <module>avro-1.5.3</module>
+ <module>avro-1.6.1</module>
+ <module>avro-1.6.3</module>
+ <module>avro-1.7.1</module>
+ <module>avro-1.7.2</module>
+ <module>avro-1.7.3</module>
+ <module>avro-1.7.4</module>
+ <module>avro-1.7.5</module>
+ <module>avro-1.7.6</module>
+ <module>avro-1.7.7</module>
</modules>
</project>