You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/06/08 21:08:17 UTC
svn commit: r1491031 - in /lucene/dev/trunk:
dev-tools/maven/solr/pom.xml.template
dev-tools/maven/solr/webapp/pom.xml.template
dev-tools/scripts/smokeTestRelease.py solr/CHANGES.txt solr/README.txt
solr/build.xml solr/webapp/build.xml
Author: rmuir
Date: Sat Jun 8 19:08:17 2013
New Revision: 1491031
URL: http://svn.apache.org/r1491031
Log:
SOLR-4792: stop shipping a war in 5.0
Removed:
lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
Modified:
lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/README.txt
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/webapp/build.xml
Modified: lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template Sat Jun 8 19:08:17 2013
@@ -34,7 +34,6 @@
<modules>
<module>core</module>
<module>solrj</module>
- <module>webapp</module>
<module>test-framework</module>
<module>contrib</module>
</modules>
Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Sat Jun 8 19:08:17 2013
@@ -970,10 +970,6 @@ def getDistributionsForMavenChecks(tmpDi
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])
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jun 8 19:08:17 2013
@@ -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
Modified: lucene/dev/trunk/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/README.txt?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/solr/README.txt (original)
+++ lucene/dev/trunk/solr/README.txt Sat Jun 8 19:08:17 2013
@@ -41,14 +41,10 @@ Files included in an Apache Solr binary
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
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Sat Jun 8 19:08:17 2013
@@ -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" />
Modified: lucene/dev/trunk/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/build.xml?rev=1491031&r1=1491030&r2=1491031&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/build.xml (original)
+++ lucene/dev/trunk/solr/webapp/build.xml Sat Jun 8 19:08:17 2013
@@ -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>