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 2017/09/04 12:18:18 UTC
servicemix-bundles git commit: [SM-3499] Create OSGi bundles for
elasticsearch 5.5.0
Repository: servicemix-bundles
Updated Branches:
refs/heads/master a65b9aec6 -> 94d5c44ff
[SM-3499] Create OSGi bundles for elasticsearch 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/94d5c44f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/94d5c44f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/94d5c44f
Branch: refs/heads/master
Commit: 94d5c44ffd595086d30f3c0e2fac6ab1b9a4585d
Parents: a65b9ae
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 4 14:17:53 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 4 14:17:53 2017 +0200
----------------------------------------------------------------------
elasticsearch-5.5.0/pom.xml | 130 -----------------
.../src/main/resources/OSGI-INF/bundle.info | 17 ---
elasticsearch-5.5.2/pom.xml | 129 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 17 +++
elasticsearch-client-5.5.2/pom.xml | 143 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 14 ++
pom.xml | 2 +
7 files changed, 305 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/94d5c44f/elasticsearch-5.5.0/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-5.5.0/pom.xml b/elasticsearch-5.5.0/pom.xml
deleted file mode 100644
index f160556..0000000
--- a/elasticsearch-5.5.0/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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>13</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.elasticsearch</artifactId>
- <version>5.5.0_2-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>5.5.0</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.elasticsearch
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- com.google.common.collect,
- com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
- com.sun.jna;resolution:=optional,
- com.ning.compress.lzf.util,
- *;resolution:=optional
- </servicemix.osgi.import.pkg>
- <servicemix.osgi.private.pkg>
- org.joda.time*;-split-package:=merge-first,
- org.apache.lucene*;-split-package:=merge-first,
- org.tartarus.snowball*,
- com.tdunning.math.stats,
- com.carrotsearch.hppc*,
- META-INF.*;-split-package:=merge-first
- </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/94d5c44f/elasticsearch-5.5.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/elasticsearch-5.5.0/src/main/resources/OSGI-INF/bundle.info b/elasticsearch-5.5.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index af11bfd..0000000
--- a/elasticsearch-5.5.0/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,17 +0,0 @@
-\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/94d5c44f/elasticsearch-5.5.2/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-5.5.2/pom.xml b/elasticsearch-5.5.2/pom.xml
new file mode 100644
index 0000000..389e98c
--- /dev/null
+++ b/elasticsearch-5.5.2/pom.xml
@@ -0,0 +1,129 @@
+<?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>13</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.elasticsearch</artifactId>
+ <version>5.5.2_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>
+ </scm>
+
+ <properties>
+ <pkgGroupId>org.elasticsearch</pkgGroupId>
+ <pkgArtifactId>elasticsearch</pkgArtifactId>
+ <pkgVersion>5.5.2</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ org.elasticsearch
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ com.google.common.collect,
+ com.fasterxml.jackson.core;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
+ com.sun.jna;resolution:=optional,
+ com.ning.compress.lzf.util,
+ *;resolution:=optional
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ org.joda.time*;-split-package:=merge-first,
+ org.apache.lucene*;-split-package:=merge-first,
+ org.tartarus.snowball*,
+ com.tdunning.math.stats,
+ com.carrotsearch.hppc*,
+ META-INF.*;-split-package:=merge-first
+ </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/94d5c44f/elasticsearch-5.5.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/elasticsearch-5.5.2/src/main/resources/OSGI-INF/bundle.info b/elasticsearch-5.5.2/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..af11bfd
--- /dev/null
+++ b/elasticsearch-5.5.2/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/94d5c44f/elasticsearch-client-5.5.2/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-client-5.5.2/pom.xml b/elasticsearch-client-5.5.2/pom.xml
new file mode 100644
index 0000000..c3548b5
--- /dev/null
+++ b/elasticsearch-client-5.5.2/pom.xml
@@ -0,0 +1,143 @@
+<?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>13</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.elasticsearch-client</artifactId>
+ <version>5.5.2_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: elasticsearch-client</name>
+ <description>This OSGi bundle wraps elasticsearch-client ${pkgVersion} jar files.</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>
+ </scm>
+
+ <properties>
+ <pkgGroupId>org.elasticsearch.client</pkgGroupId>
+ <pkgVersion>5.5.2</pkgVersion>
+ <servicemix.osgi.export>
+ org.elasticsearch.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.client.sniff;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.transport.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.client.transport;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
+ <servicemix.osgi.import.pkg>
+
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>rest</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>transport</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>sniffer</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>rest</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>transport</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>sniffer</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}:rest</include>
+ <include>${pkgGroupId}:transport</include>
+ <include>${pkgGroupId}:sniffer</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:rest</artifact>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:transport</artifact>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:sniffer</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/94d5c44f/elasticsearch-client-5.5.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/elasticsearch-client-5.5.2/src/main/resources/OSGI-INF/bundle.info b/elasticsearch-client-5.5.2/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..633bf8b
--- /dev/null
+++ b/elasticsearch-client-5.5.2/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,14 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/rest/${pkgVersion}\u001B[0m
+ \u001B[33mmvn:${pkgGroupId}/transport/${pkgVersion}\u001B[0m
+ \u001B[33mmvn:${pkgGroupId}/sniffer/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ This is the elasticsearch client bundle introduced in Elasticsearch 5.x.
+ It allows you to communicate with Elasticsearch instances.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://www.elasticsearch.org\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/94d5c44f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a84df2..18e9f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,8 @@
<module>spring-security-config-4.2.3.RELEASE</module>
<module>elasticsearch-client-5.3.2</module>
<module>elasticsearch-client-5.4.3</module>
+ <module>elasticsearch-5.5.2</module>
+ <module>elasticsearch-client-5.5.2</module>
</modules>
</project>