You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2015/12/31 10:50:14 UTC

[1/2] servicemix-bundles git commit: [SM-2784] Create OSGi bundle for Elasticsearch 2.1.1

Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 577b4c5ce -> 1088d4ab4


[SM-2784] Create OSGi bundle for Elasticsearch 2.1.1


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

Branch: refs/heads/master
Commit: 3feaf122f0f61beff7365aa669692f8792d60e9c
Parents: ec6b5ec
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Dec 22 13:18:29 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Dec 22 13:18:29 2015 +0100

----------------------------------------------------------------------
 elasticsearch-2.1.1/pom.xml                     | 122 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  17 +++
 pom.xml                                         |   1 +
 3 files changed, 140 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3feaf122/elasticsearch-2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.1.1/pom.xml b/elasticsearch-2.1.1/pom.xml
new file mode 100644
index 0000000..669120e
--- /dev/null
+++ b/elasticsearch-2.1.1/pom.xml
@@ -0,0 +1,122 @@
+<?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.elasticsearch</artifactId>
+    <version>2.1.1_1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</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.elasticsearch</pkgGroupId>
+        <pkgArtifactId>elasticsearch</pkgArtifactId>
+        <pkgVersion>2.1.1</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.elasticsearch
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            *;resolution:=optional,
+        </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.apache.lucene*;-split-package:=merge-last,
+            org.tartarus.snowball*,
+            org.apache.regexp,
+            META-INF.*
+        </servicemix.osgi.private.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+        </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>
+                                    <include>org.apache.lucene:*</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <includes>
+                                        <include>config/**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.lucene:*</artifact>
+                                    <includes>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            </transformers>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3feaf122/elasticsearch-2.1.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/elasticsearch-2.1.1/src/main/resources/OSGI-INF/bundle.info b/elasticsearch-2.1.1/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..af11bfd
--- /dev/null
+++ b/elasticsearch-2.1.1/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,17 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    So, we build a web site or an application and want to add search to it, and
+    then it hits us: getting search working is hard. We want our search solution
+    to be fast, we want a painless setup and a completely free search schema, we
+    want to be able to index data simply using JSON over HTTP, we want our search
+    server to be always available, we want to be able to start with one machine
+    and scale to hundreds, we want real-time search, we want simple multi-tenancy,
+    and we want a solution that is built for the cloud.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://www.elasticsearch.org\u001B[0m

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3feaf122/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 736e9a9..6824f48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <module>aws-java-sdk-1.10.40</module>
         <module>aws-java-sdk-1.10.41</module>
         <module>elasticsearch-2.0.1</module>
+        <module>elasticsearch-2.1.1</module>
         <module>gae-1.9.30</module>
         <module>quickfix-1.6.1</module>
         <module>lucene-5.4.0</module>


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

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

Branch: refs/heads/master
Commit: 1088d4ab449d24b3daefeee13687d093338fe455
Parents: 577b4c5 3feaf12
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Dec 31 10:49:56 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Dec 31 10:49:56 2015 +0100

----------------------------------------------------------------------
 elasticsearch-2.1.1/pom.xml                     | 122 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  17 +++
 pom.xml                                         |   1 +
 3 files changed, 140 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/1088d4ab/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9c220b1,6824f48..306fe55
--- a/pom.xml
+++ b/pom.xml
@@@ -51,9 -51,8 +51,10 @@@
          <module>aws-java-sdk-1.10.39</module>
          <module>aws-java-sdk-1.10.40</module>
          <module>aws-java-sdk-1.10.41</module>
 +        <module>aws-java-sdk-1.10.42</module>
          <module>elasticsearch-2.0.1</module>
 +        <module>elasticsearch-2.0.2</module>
+         <module>elasticsearch-2.1.1</module>
          <module>gae-1.9.30</module>
          <module>quickfix-1.6.1</module>
          <module>lucene-5.4.0</module>