servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [2/2] servicemix-bundles git commit: Merge branch 'SM-2733' of https://github.com/oscerd/servicemix-bundles
Date Tue, 17 Nov 2015 22:56:46 GMT
Merge branch 'SM-2733' of https://github.com/oscerd/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/709e8147
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/709e8147
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/709e8147

Branch: refs/heads/master
Commit: 709e8147e09baff24d50a265de0d7edede7771d2
Parents: d8bd4e2 d41b59e
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Wed Nov 18 06:56:28 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Wed Nov 18 06:56:28 2015 +0800

----------------------------------------------------------------------
 facebook4j-2.3.2/pom.xml                        | 109 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 3 files changed, 121 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/709e8147/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0ada5af,3e4509c..52fa699
--- a/pom.xml
+++ b/pom.xml
@@@ -51,7 -51,7 +51,8 @@@
          <module>elasticsearch-2.0.0</module>
          <module>olingo-odata2-core-2.0.5</module>
          <module>olingo-odata2-api-2.0.5</module>
 +        <module>facebook4j-2.3.1</module>
+         <module>facebook4j-2.3.2</module>
      </modules>
  
  </project>


Mime
View raw message