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-2731' of https://github.com/oscerd/servicemix-bundles
Date Mon, 16 Nov 2015 02:21:35 GMT
Merge branch 'SM-2731' 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/9b0b0eb7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/9b0b0eb7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/9b0b0eb7

Branch: refs/heads/master
Commit: 9b0b0eb760edc98568cd3f1417a72ce1c5d1ccf3
Parents: 088267f 020d2d7
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Mon Nov 16 10:20:50 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Mon Nov 16 10:20:50 2015 +0800

----------------------------------------------------------------------
 olingo-odata2-api-2.0.5/pom.xml                 | 106 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  10 ++
 olingo-odata2-core-2.0.5/pom.xml                | 106 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  10 ++
 pom.xml                                         |   2 +
 5 files changed, 234 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/9b0b0eb7/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 474d771,315693e..2c7a031
--- a/pom.xml
+++ b/pom.xml
@@@ -48,7 -48,8 +48,9 @@@
          <module>aws-java-sdk-1.10.32</module>
          <module>aws-java-sdk-1.10.33</module>
          <module>ognl-3.1.1</module>
 +        <module>elasticsearch-2.0.0</module>
+         <module>olingo-odata2-core-2.0.5</module>
+         <module>olingo-odata2-api-2.0.5</module>
      </modules>
  
  </project>


Mime
View raw message