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 2016/02/29 08:25:24 UTC

[1/2] servicemix-bundles git commit: [SM-2889] Create OSGi bundle for Solr 5.5.0

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master ef308a249 -> 3283fd3f4


[SM-2889] Create OSGi bundle for Solr 5.5.0


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/7ba94797
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/7ba94797
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/7ba94797

Branch: refs/heads/master
Commit: 7ba947971f13078773fcd38325aed47b19ce4435
Parents: 0c6768c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Feb 29 08:06:00 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 08:06:00 2016 +0100

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 solr-solrj-5.5.0/pom.xml                        | 169 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  21 +++
 3 files changed, 191 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7ba94797/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de12e1d..9f87b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <module>cglib-3.2.1</module>
         <module>kafka_2.10-0.9.0.1</module>
         <module>hystrix-1.4.23</module>
+        <module>solr-solrj-5.5.0</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7ba94797/solr-solrj-5.5.0/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-5.5.0/pom.xml b/solr-solrj-5.5.0/pom.xml
new file mode 100644
index 0000000..838894c
--- /dev/null
+++ b/solr-solrj-5.5.0/pom.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>12</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.solr-solrj</artifactId>
+    <packaging>bundle</packaging>
+    <version>5.5.0_1-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Bundles :: SolrJ</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.solr</pkgGroupId>
+        <pkgArtifactId>solr-solrj</pkgArtifactId>
+        <pkgVersion>5.5.0</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.apache.solr
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            javax.net.ssl*,
+            javax.security.auth.login,
+            javax.xml*,
+            org.w3c.dom,
+            org.xml.sax*,
+            org.apache.commons.io,
+            org.apache.commons.io.input,
+            org.apache.http*,
+            org.apache.noggit;resolution:=optional,
+            org.apache.zookeeper*;resolution:=optional,
+            org.noggit;resolution:=optional,
+            org.slf4j;resolution:=optional
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.noggit</groupId>
+                    <artifactId>noggit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpmime</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.noggit</groupId>
+                    <artifactId>noggit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpmime</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/7ba94797/solr-solrj-5.5.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/solr-solrj-5.5.0/src/main/resources/OSGI-INF/bundle.info b/solr-solrj-5.5.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..d679ddc
--- /dev/null
+++ b/solr-solrj-5.5.0/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,21 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Solr is the popular, blazing fast open source enterprise search platform from the Apache Lucene project.
+    Its major features include powerful full-text search, hit highlighting, faceted search, dynamic clustering,
+    database integration, rich document (e.g., Word, PDF) handling, and geospatial search. Solr is highly scalable,
+    providing distributed search and index replication, and it powers the search and navigation features of many of
+    the world's largest internet sites.
+
+    Solr is written in Java and runs as a standalone full-text search server within a servlet container such as Tomcat.
+    Solr uses the Lucene Java search library at its core for full-text indexing and search, and has REST-like HTTP/XML
+    and JSON APIs that make it easy to use from virtually any programming language. Solr's powerful external
+    configuration allows it to be tailored to almost any type of application without Java coding, and it has an
+    extensive plugin architecture when more advanced customization is required.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://lucene.apache.org/solr/\u001B[0m


[2/2] servicemix-bundles git commit: Merge branch 'SM-2889' of https://github.com/oscerd/servicemix-bundles

Posted by ff...@apache.org.
Merge branch 'SM-2889' 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/3283fd3f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/3283fd3f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/3283fd3f

Branch: refs/heads/master
Commit: 3283fd3f4a7208a7fadf9c8dba201ef67a2203eb
Parents: ef308a2 7ba9479
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Feb 29 15:24:21 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Feb 29 15:24:21 2016 +0800

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 solr-solrj-5.5.0/pom.xml                        | 169 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  21 +++
 3 files changed, 191 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3283fd3f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cd7401a,9f87b7d..92b311f
--- a/pom.xml
+++ b/pom.xml
@@@ -47,11 -47,7 +47,12 @@@
          <module>cglib-3.2.1</module>
          <module>kafka_2.10-0.9.0.1</module>
          <module>hystrix-1.4.23</module>
 +        <module>lucene-5.5.0</module>
 +        <module>lucene-analyzers-common-5.5.0</module>
 +        <module>lucene-queries-5.5.0</module>
 +        <module>lucene-queryparser-5.5.0</module>
 +        <module>lucene-sandbox-5.5.0</module>
+         <module>solr-solrj-5.5.0</module>
      </modules>
  
  </project>