svn commit: r1641990 - in /lucene/dev/branches/branch_5x: dev-tools/maven/solr/pom.xml.template dev-tools/maven/solr/webapp/pom.xml.template dev-tools/scripts/smokeTestRelease.py solr/CHANGES.txt solr/build.xml solr/webapp/build.xml

[ma...@apache.org]

Author: markrmiller
Date: Thu Nov 27 01:33:54 2014
New Revision: 1641990

URL: http://svn.apache.org/r1641990
Log:
SOLR-4792: Stop shipping a .war.

Removed:
    lucene/dev/branches/branch_5x/dev-tools/maven/solr/webapp/pom.xml.template
Modified:
    lucene/dev/branches/branch_5x/dev-tools/maven/solr/pom.xml.template
    lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/build.xml
    lucene/dev/branches/branch_5x/solr/webapp/build.xml

Modified: lucene/dev/branches/branch_5x/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/maven/solr/pom.xml.template?rev=1641990&r1=1641989&r2=1641990&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/branch_5x/dev-tools/maven/solr/pom.xml.template Thu Nov 27 01:33:54 2014
@@ -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/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py?rev=1641990&r1=1641989&r2=1641990&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py Thu Nov 27 01:33:54 2014
@@ -1049,10 +1049,6 @@ def getBinaryDistFiles(project, tmpDir, 
   print('    unpack %s...' % distribution)
   unpackLogFile = '%s/unpack-%s-getBinaryDistFiles.log' % (tmpDir, distribution)
   run('tar xzf %s/%s' % (tmpDir, distribution), unpackLogFile)
-  if project == 'solr': # unpack the Solr war
-    unpackLogFile = '%s/unpack-solr-war-getBinaryDistFiles.log' % tmpDir
-    print('        unpack Solr war...')
-    run('jar xvf */dist/*.war', unpackLogFile)
   distributionFiles = []
   for root, dirs, files in os.walk(destDir):
     distributionFiles.extend([os.path.join(root, file) for file in files])

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1641990&r1=1641989&r2=1641990&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Nov 27 01:33:54 2014
@@ -382,6 +382,8 @@ Other Changes
 * SOLR-5864: Remove previous SolrCore as parameter on reload.
   (Tomás Fernández Löbbe) 
 
+* SOLR-4792: Stop shipping a .war. (Robert Muir, Ramkumar Aiyengar, Mark Miller)
+
 ==================  4.10.3 ==================
 
 Bug Fixes

Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1641990&r1=1641989&r2=1641990&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Thu Nov 27 01:33:54 2014
@@ -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." />
@@ -484,7 +484,7 @@
                   includes="bin/* server/**/*.sh 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/branches/branch_5x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/build.xml?rev=1641990&r1=1641989&r2=1641990&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/build.xml Thu Nov 27 01:33:54 2014
@@ -62,8 +62,9 @@
     </war>
   </target>
 
-  <target name="-dist-maven" depends="install-maven-tasks">
-    <m2-deploy jar.file="${solr.tgz.unpack.dir}/solr-${version}/dist/solr-${version}.war"
-               pom.xml="${filtered.pom.templates.dir}/solr/webapp/pom.xml"/>
-  </target>
+  <!-- nothing to do -->
+  <target name="-dist-maven"/>
+
+  <!-- nothing to do -->
+  <target name="-validate-maven-dependencies"/>
 </project>