Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 4145d7aef -> 45db81ce6


[SM-3848] Create OSGi bundle for solr-solrj 7.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/45db81ce
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/45db81ce
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/45db81ce

Branch: refs/heads/master
Commit: 45db81ce6e44335ca187c9e3cf75f7278d313757
Parents: 4145d7a
Author: Jean-Baptiste Onofré <j...@nanthrax.net>
Authored: Mon Oct 29 05:29:59 2018 +0100
Committer: Jean-Baptiste Onofré <j...@nanthrax.net>
Committed: Mon Oct 29 05:29:59 2018 +0100

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 solr-solrj-7.3.1/pom.xml                        | 171 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  21 ---
 solr-solrj-7.5.0/pom.xml                        | 170 ++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  21 +++
 5 files changed, 192 insertions(+), 192 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/45db81ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ac2326..d33062a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
        <module>ognl-3.2.8</module>
        <module>okio-2.1.0</module>
        <module>influxdb-java-2.14</module>
+       <module>solr-solrj-7.5.0</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/45db81ce/solr-solrj-7.3.1/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-7.3.1/pom.xml b/solr-solrj-7.3.1/pom.xml
deleted file mode 100644
index f8e7662..0000000
--- a/solr-solrj-7.3.1/pom.xml
+++ /dev/null
@@ -1,171 +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>7.3.1_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>7.3.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>
-                                    <include>META-INF/services/**/*</include>
-                                    <include>apispec/**/*</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/45db81ce/solr-solrj-7.3.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/solr-solrj-7.3.1/src/main/resources/OSGI-INF/bundle.info 
b/solr-solrj-7.3.1/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index d679ddc..0000000
--- a/solr-solrj-7.3.1/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/45db81ce/solr-solrj-7.5.0/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-7.5.0/pom.xml b/solr-solrj-7.5.0/pom.xml
new file mode 100644
index 0000000..185e15b
--- /dev/null
+++ b/solr-solrj-7.5.0/pom.xml
@@ -0,0 +1,170 @@
+<?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.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>
+  </scm>
+
+    <properties>
+        <pkgGroupId>org.apache.solr</pkgGroupId>
+        <pkgArtifactId>solr-solrj</pkgArtifactId>
+        <pkgVersion>7.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>
+                                    <include>META-INF/services/**/*</include>
+                                    <include>apispec/**/*</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/45db81ce/solr-solrj-7.5.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/solr-solrj-7.5.0/src/main/resources/OSGI-INF/bundle.info 
b/solr-solrj-7.5.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..d679ddc
--- /dev/null
+++ b/solr-solrj-7.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

Reply via email to