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/10/16 08:49:39 UTC
servicemix-bundles git commit: [SM-3536] Create OSGi bundle for SolrJ
7.0.1
Repository: servicemix-bundles
Updated Branches:
refs/heads/master b398446b5 -> 21e25b2ff
[SM-3536] Create OSGi bundle for SolrJ 7.0.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/21e25b2f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/21e25b2f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/21e25b2f
Branch: refs/heads/master
Commit: 21e25b2ffaec44c15c9a6c3434c1b61e80601403
Parents: b398446
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Oct 16 10:49:16 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Oct 16 10:49:16 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
solr-solrj-6.6.0/pom.xml | 183 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 21 ---
solr-solrj-7.0.1/pom.xml | 182 ++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 21 +++
5 files changed, 204 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/21e25b2f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0b9a46..0d77d36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<module>azure-storage-6.0.0</module>
<module>docker-java-3.0.14</module>
<module>orbitz-consul-client-0.16.4</module>
+ <module>solr-solrj-7.0.1</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/21e25b2f/solr-solrj-6.6.0/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-6.6.0/pom.xml b/solr-solrj-6.6.0/pom.xml
deleted file mode 100644
index 09dd703..0000000
--- a/solr-solrj-6.6.0/pom.xml
+++ /dev/null
@@ -1,183 +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.solr-solrj</artifactId>
- <packaging>bundle</packaging>
- <version>6.6.0_2-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>6.6.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>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- <inherited>false</inherited>
- <configuration>
- <instructions>
- <Export-Package>${servicemix.osgi.export}</Export-Package>
- <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/21e25b2f/solr-solrj-6.6.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/solr-solrj-6.6.0/src/main/resources/OSGI-INF/bundle.info b/solr-solrj-6.6.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index d679ddc..0000000
--- a/solr-solrj-6.6.0/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,21 +0,0 @@
-\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
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/21e25b2f/solr-solrj-7.0.1/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-7.0.1/pom.xml b/solr-solrj-7.0.1/pom.xml
new file mode 100644
index 0000000..6ff6acc
--- /dev/null
+++ b/solr-solrj-7.0.1/pom.xml
@@ -0,0 +1,182 @@
+<?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.solr-solrj</artifactId>
+ <packaging>bundle</packaging>
+ <version>7.0.1_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>
+ </scm>
+
+ <properties>
+ <pkgGroupId>org.apache.solr</pkgGroupId>
+ <pkgArtifactId>solr-solrj</pkgArtifactId>
+ <pkgVersion>7.0.1</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>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ <inherited>false</inherited>
+ <configuration>
+ <instructions>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
+ <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
+ <Bundle-NativeCode>*</Bundle-NativeCode>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/21e25b2f/solr-solrj-7.0.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/solr-solrj-7.0.1/src/main/resources/OSGI-INF/bundle.info b/solr-solrj-7.0.1/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..d679ddc
--- /dev/null
+++ b/solr-solrj-7.0.1/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