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/10/13 07:00:40 UTC
[1/2] servicemix-bundles git commit: [SM-2699]reflections bundle need
use higher com.google.guava version
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 8db8a9522 -> 5ad6d6a31
[SM-2699]reflections bundle need use higher com.google.guava version
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/fc63f11f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/fc63f11f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/fc63f11f
Branch: refs/heads/master
Commit: fc63f11f701de015d041d51a42be43faa97f3524
Parents: 9fd5c4d
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Oct 13 12:56:04 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Oct 13 12:56:04 2015 +0800
----------------------------------------------------------------------
pom.xml | 1 +
reflections-0.9.9/pom.xml | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/fc63f11f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7eb7869..79228e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<module>spring-jdbc-4.1.7.RELEASE</module>
<module>spring-jdbc-4.2.0.RELEASE</module>
<module>ognl-3.1</module>
+ <module>reflections-0.9.9</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/fc63f11f/reflections-0.9.9/pom.xml
----------------------------------------------------------------------
diff --git a/reflections-0.9.9/pom.xml b/reflections-0.9.9/pom.xml
index 4572509..0d872c8 100644
--- a/reflections-0.9.9/pom.xml
+++ b/reflections-0.9.9/pom.xml
@@ -51,10 +51,10 @@
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
org.osgi.framework,
- com.google.common.base;resolution:=optional;version="[15.0,19)",
- com.google.common.cache;resolution:=optional;version="[15.0,19)",
- com.google.common.collect;resolution:=optional;version="[15.0,19)",
- com.google.common.io;resolution:=optional;version="[15.0,19)",
+ com.google.common.base;resolution:=optional;version="[18.0,19)",
+ com.google.common.cache;resolution:=optional;version="[18.0,19)",
+ com.google.common.collect;resolution:=optional;version="[18.0,19)",
+ com.google.common.io;resolution:=optional;version="[18.0,19)",
com.google.gson;resolution:=optional,
javassist;resolution:=optional,
javassist.expr;resolution:=optional,
[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
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/5ad6d6a3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5ad6d6a3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5ad6d6a3
Branch: refs/heads/master
Commit: 5ad6d6a315ad9fe27572af5293fe8443b060d432
Parents: fc63f11 8db8a95
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Oct 13 13:00:16 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Oct 13 13:00:16 2015 +0800
----------------------------------------------------------------------
docker-java-2.1.1/pom.xml | 106 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
poi-3.13/pom.xml | 216 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 38 ++++
pom.xml | 4 +
postgresql-9.4-1204-jdbc42/pom.xml | 105 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
sparkjava-core-2.3/pom.xml | 120 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
9 files changed, 622 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5ad6d6a3/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 79228e4,be8e208..77ca806
--- a/pom.xml
+++ b/pom.xml
@@@ -73,7 -73,10 +73,11 @@@
<module>spring-jdbc-4.1.7.RELEASE</module>
<module>spring-jdbc-4.2.0.RELEASE</module>
<module>ognl-3.1</module>
+ <module>reflections-0.9.9</module>
+ <module>docker-java-2.1.1</module>
+ <module>postgresql-9.4-1204-jdbc42</module>
+ <module>sparkjava-core-2.3</module>
+ <module>poi-3.13</module>
</modules>
</project>