mirror of https://github.com/apache/lucene.git
SOLR-4792: stop shipping a war in 5.0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1491031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir
parent
fdff37f36e
commit
92ec6ec337
|
|
@ -34,7 +34,6 @@
|
|||
<modules>
|
||||
<module>core</module>
|
||||
<module>solrj</module>
|
||||
<module>webapp</module>
|
||||
<module>test-framework</module>
|
||||
<module>contrib</module>
|
||||
</modules>
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
<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/maven-v4_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.solr</groupId>
|
||||
<artifactId>solr-parent</artifactId>
|
||||
<version>@version@</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.apache.solr</groupId>
|
||||
<artifactId>solr</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<name>Apache Solr Search Server</name>
|
||||
<description>Apache Solr Search Server</description>
|
||||
<properties>
|
||||
<module-directory>solr/webapp</module-directory>
|
||||
<relative-top-level>../../..</relative-top-level>
|
||||
<module-path>${relative-top-level}/${module-directory}</module-path>
|
||||
</properties>
|
||||
<scm>
|
||||
<connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
|
||||
<developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
|
||||
<url>${vc-browse-base-url}/${module-directory}</url>
|
||||
</scm>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>solr-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>solr-solrj</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||
<artifactId>javax.servlet</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<directory>${build-directory}</directory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip> <!-- There are no public or protected classes -->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<configuration>
|
||||
<!-- There are no sources for the Solr WAR, but -->
|
||||
<!-- the maven-source-plugin has no "skip" option. -->
|
||||
<!-- Setting attach=false prevents the built jar -->
|
||||
<!-- from being installed or deployed. -->
|
||||
<attach>false</attach>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<configuration>
|
||||
<warSourceDirectory>${module-path}/web</warSourceDirectory>
|
||||
<webXml>${module-path}/web/WEB-INF/web.xml</webXml>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<!-- http://wiki.eclipse.org/Jetty/Feature/Jetty_Maven_Plugin -->
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<scanIntervalSeconds>10</scanIntervalSeconds>
|
||||
<webAppConfig>
|
||||
<contextPath>/solr</contextPath>
|
||||
</webAppConfig>
|
||||
<webAppSourceDirectory>${module-path}/web</webAppSourceDirectory>
|
||||
<systemProperties>
|
||||
<systemProperty>
|
||||
<name>solr.solr.home</name>
|
||||
<value>${top-level}/solr/example/solr</value>
|
||||
</systemProperty>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>de.thetaphi</groupId>
|
||||
<artifactId>forbiddenapis</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>solr-shared-check-forbidden-apis</id>
|
||||
<phase>none</phase> <!-- Block inherited execution -->
|
||||
</execution>
|
||||
<execution>
|
||||
<id>solr-shared-test-check-forbidden-apis</id>
|
||||
<phase>none</phase> <!-- Block inherited execution -->
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -970,10 +970,6 @@ def getDistributionsForMavenChecks(tmpDir, version, baseURL):
|
|||
print(' unpack %s...' % distribution)
|
||||
unpackLogFile = '%s/unpack-%s-maven-checks.log' % (tmpDir, distribution)
|
||||
run('tar xzf %s/%s' % (tmpDir, distribution), unpackLogFile)
|
||||
if project == 'solr': # unpack the Solr war
|
||||
unpackLogFile = '%s/unpack-solr-war-maven-checks.log' % tmpDir
|
||||
print(' unpack Solr war...')
|
||||
run('jar xvf */dist/*.war', unpackLogFile)
|
||||
distributionFiles[project] = []
|
||||
for root, dirs, files in os.walk(destDir):
|
||||
distributionFiles[project].extend([os.path.join(root, file) for file in files])
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ Other Changes
|
|||
* SOLR-4622: Hardcoded SolrCloud defaults for hostContext and hostPort that
|
||||
were deprecated in 4.3 have been removed completely. (hossman)
|
||||
|
||||
* SOLR-4792: Stop shipping a .war. (Robert Muir)
|
||||
|
||||
================== 4.4.0 ==================
|
||||
|
||||
Versions of Major Components
|
||||
|
|
|
|||
|
|
@ -41,14 +41,10 @@ Files included in an Apache Solr binary distribution
|
|||
|
||||
example/
|
||||
A self-contained example Solr instance, complete with a sample
|
||||
configuration, documents to index, and the Jetty Servlet container.
|
||||
configuration and documents to index.
|
||||
Please see example/README.txt for information about running this
|
||||
example.
|
||||
|
||||
dist/solr-XX.war
|
||||
The Apache Solr Application. Deploy this WAR file to any servlet
|
||||
container to run Apache Solr.
|
||||
|
||||
dist/solr-<component>-XX.jar
|
||||
The Apache Solr libraries. To compile Apache Solr Plugins,
|
||||
one or more of these will be required. The core library is
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<echo message="And for developers:"/>
|
||||
<echo message="Use 'ant clean' to clean compiled files." />
|
||||
<echo message="Use 'ant compile' to compile the source code." />
|
||||
<echo message="Use 'ant dist' to build the project WAR and JAR files." />
|
||||
<echo message="Use 'ant dist' to build the project JAR files." />
|
||||
<echo message="Use 'ant documentation' to build documentation." />
|
||||
<echo message="Use 'ant generate-maven-artifacts' to generate maven artifacts." />
|
||||
<echo message="Use 'ant package' to generate zip, tgz for distribution." />
|
||||
|
|
@ -476,7 +476,7 @@
|
|||
includes="example/**/*.sh example/**/bin/" />
|
||||
<tarfileset dir="."
|
||||
prefix="${fullnamever}"
|
||||
includes="dist/*.jar dist/*.war
|
||||
includes="dist/*.jar
|
||||
dist/solrj-lib/*
|
||||
dist/test-framework/**"
|
||||
excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar **/*.sha1" />
|
||||
|
|
|
|||
|
|
@ -65,8 +65,7 @@
|
|||
</war>
|
||||
</target>
|
||||
|
||||
<target name="dist-maven" depends="dist, filter-pom-templates, install-maven-tasks, m2-deploy-solr-parent-pom">
|
||||
<m2-deploy jar.file="${dist}/solr-${version}.war"
|
||||
pom.xml="${filtered.pom.templates.dir}/solr/webapp/pom.xml"/>
|
||||
<!-- nothing to do -->
|
||||
<target name="dist-maven">
|
||||
</target>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue