I wonder why you did this, in 4.x the IVY ones still have the old velocity version? Now they differ!
I fixed the Maven build error yesterday in trunk by applying that fix, but not 4.x because it did not contains your new velocity stuff. ----- Uwe Schindler H.-H.-Meier-Allee 63, D-28213 Bremen http://www.thetaphi.de eMail: [email protected] > -----Original Message----- > From: [email protected] [mailto:[email protected]] > Sent: Sunday, December 30, 2012 12:26 PM > To: [email protected] > Subject: svn commit: r1426916 - in /lucene/dev/branches/branch_4x: ./ dev- > tools/ dev-tools/maven/ lucene/ lucene/analysis/ > lucene/analysis/icu/src/java/org/apache/lucene/collation/ > lucene/backwards/ lucene/benchmark/ lucene/codecs/ lucene/core/ > lucene/core/src/... > > Author: ehatcher > Date: Sun Dec 30 11:26:26 2012 > New Revision: 1426916 > > URL: http://svn.apache.org/viewvc?rev=1426916&view=rev > Log: > SOLR-3735: fix maven POM for upgraded Velocity JAR > > Modified: > lucene/dev/branches/branch_4x/ (props changed) > lucene/dev/branches/branch_4x/dev-tools/ (props changed) > lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template > lucene/dev/branches/branch_4x/lucene/ (props changed) > lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed) > lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed) > lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt > (props changed) > lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed) > lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed) > lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed) > lucene/dev/branches/branch_4x/lucene/README.txt (props changed) > lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt > (props changed) > lucene/dev/branches/branch_4x/lucene/analysis/ (props changed) > > lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/l > ucene/collation/ICUCollationKeyFilterFactory.java (props changed) > lucene/dev/branches/branch_4x/lucene/backwards/ (props changed) > lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed) > lucene/dev/branches/branch_4x/lucene/build.xml (props changed) > lucene/dev/branches/branch_4x/lucene/codecs/ (props changed) > lucene/dev/branches/branch_4x/lucene/common-build.xml (props > changed) > lucene/dev/branches/branch_4x/lucene/core/ (props changed) > > lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/i > ndex/TestBackwardsCompatibility.java (props changed) > > lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/i > ndex/index.40.cfs.zip (props changed) > > lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/i > ndex/index.40.nocfs.zip (props changed) > > lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/i > ndex/index.40.optimized.cfs.zip (props changed) > > lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/i > ndex/index.40.optimized.nocfs.zip (props changed) > lucene/dev/branches/branch_4x/lucene/demo/ (props changed) > lucene/dev/branches/branch_4x/lucene/facet/ (props changed) > lucene/dev/branches/branch_4x/lucene/grouping/ (props changed) > lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed) > lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props > changed) > lucene/dev/branches/branch_4x/lucene/join/ (props changed) > lucene/dev/branches/branch_4x/lucene/licenses/ (props changed) > lucene/dev/branches/branch_4x/lucene/memory/ (props changed) > lucene/dev/branches/branch_4x/lucene/misc/ (props changed) > lucene/dev/branches/branch_4x/lucene/module-build.xml (props > changed) > lucene/dev/branches/branch_4x/lucene/queries/ (props changed) > lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed) > lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed) > lucene/dev/branches/branch_4x/lucene/site/ (props changed) > lucene/dev/branches/branch_4x/lucene/spatial/ (props changed) > lucene/dev/branches/branch_4x/lucene/suggest/ (props changed) > lucene/dev/branches/branch_4x/lucene/test-framework/ (props > changed) > lucene/dev/branches/branch_4x/lucene/tools/ (props changed) > lucene/dev/branches/branch_4x/solr/ (props changed) > lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed) > lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed) > lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed) > lucene/dev/branches/branch_4x/solr/README.txt (props changed) > lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt > (props changed) > lucene/dev/branches/branch_4x/solr/build.xml (props changed) > lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed) > lucene/dev/branches/branch_4x/solr/common-build.xml (props > changed) > lucene/dev/branches/branch_4x/solr/contrib/ (props changed) > lucene/dev/branches/branch_4x/solr/core/ (props changed) > lucene/dev/branches/branch_4x/solr/example/ (props changed) > lucene/dev/branches/branch_4x/solr/licenses/ (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt > (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt > (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt > (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt > (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt > (props changed) > lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt > (props changed) > lucene/dev/branches/branch_4x/solr/scripts/ (props changed) > lucene/dev/branches/branch_4x/solr/site/ (props changed) > lucene/dev/branches/branch_4x/solr/solrj/ (props changed) > lucene/dev/branches/branch_4x/solr/test-framework/ (props changed) > lucene/dev/branches/branch_4x/solr/testlogging.properties (props > changed) > lucene/dev/branches/branch_4x/solr/webapp/ (props changed) > > Modified: lucene/dev/branches/branch_4x/dev- > tools/maven/pom.xml.template > URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev- > tools/maven/pom.xml.template?rev=1426916&r1=1426915&r2=1426916&vie > w=diff > ========================================================== > ==================== > --- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template > (original) > +++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template > Sun Dec 30 11:26:26 2012 > @@ -333,7 +333,7 @@ > <dependency> > <groupId>org.apache.velocity</groupId> > <artifactId>velocity</artifactId> > - <version>1.6.4</version> > + <version>1.7</version> > </dependency> > <dependency> > <groupId>org.apache.velocity</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
