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 'master' of https://git-wip-us.apache.org/repos/asf/servicemix-bundles
Date Wed, 20 Apr 2016 07:25:04 GMT
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/8a066243
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/8a066243
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/8a066243

Branch: refs/heads/master
Commit: 8a0662433d1b22224a7c6bce586d142ef7a3f19b
Parents: a45fb56 d7c9413
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Wed Apr 20 15:24:24 2016 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Wed Apr 20 15:24:24 2016 +0800

----------------------------------------------------------------------
 jnats-0.4.1/pom.xml                             | 109 ++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 lucene-6.0.0/pom.xml                            | 120 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 lucene-analyzers-common-6.0.0/pom.xml           | 116 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 lucene-queries-6.0.0/pom.xml                    | 110 ++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 lucene-queryparser-6.0.0/pom.xml                | 115 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 lucene-sandbox-6.0.0/pom.xml                    | 111 ++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 okio-1.7.0/pom.xml                              | 107 ++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  12 +
 pom.xml                                         |  12 +
 retrofit-2.0.1/pom.xml                          | 344 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 solr-solrj-6.0.0/pom.xml                        | 183 ++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  21 ++
 spring-security-acl-4.0.4.RELEASE/pom.xml       | 122 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 spring-security-taglibs-4.0.4.RELEASE/pom.xml   | 126 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 spring-security-web-4.0.4.RELEASE/pom.xml       | 132 +++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 25 files changed, 1855 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/8a066243/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 4c1738f,0cc2ebb..d2eaf55
--- a/pom.xml
+++ b/pom.xml
@@@ -44,8 -44,18 +44,20 @@@
      <modules>
          <!-- add modules for all bundles to released in the next batch here -->
          <module>elasticsearch-2.3.0</module>
 +        <module>hystrix-1.4.23</module>
 +        <module>hystrix-1.3.13</module>
+         <module>jnats-0.4.1</module>
+         <module>solr-solrj-6.0.0</module>
+         <module>lucene-6.0.0</module>
+         <module>lucene-analyzers-common-6.0.0</module>
+         <module>lucene-queries-6.0.0</module>
+         <module>lucene-queryparser-6.0.0</module>
+         <module>lucene-sandbox-6.0.0</module>
+         <module>okio-1.7.0</module>
+         <module>retrofit-2.0.1</module>
+         <module>spring-security-web-4.0.4.RELEASE</module>
+         <module>spring-security-acl-4.0.4.RELEASE</module>
+         <module>spring-security-taglib-4.0.4.RELEASE</module>
      </modules>
  
  </project>


Mime
View raw message