You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/19 23:56:37 UTC

[lucene-solr] branch branch_8x updated: Update JGit for working copy checks and explicitely set nop-logging

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 053abc7  Update JGit for working copy checks and explicitely set nop-logging
053abc7 is described below

commit 053abc723402ae9977afcf216e8147c5bb168303
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sat Apr 20 01:55:23 2019 +0200

    Update JGit for working copy checks and explicitely set nop-logging
---
 build.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 96fc565..3d7ee87 100755
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
 <project name="lucene-solr" default="-projecthelp" basedir=".">
   <import file="lucene/common-build.xml"/>
 
-  <property name="jgit-version" value="4.6.0.201612231935-r"/>
+  <property name="jgit-version" value="5.3.0.201903130848-r"/>
   
   <property name="tests.heap-dump-dir" location="heapdumps"/>
   
@@ -485,9 +485,10 @@ File | Project Structure | Platform Settings | SDKs):
     <sequential>
       <local name="wc.unversioned.files"/>
       <local name="wc.modified.files"/>
-      <ivy:cachepath xmlns:ivy="antlib:org.apache.ivy.ant"
-        organisation="org.eclipse.jgit" module="org.eclipse.jgit" revision="${jgit-version}"
-        inline="true" conf="default" transitive="true" pathid="jgit.classpath"/>
+      <ivy:cachepath xmlns:ivy="antlib:org.apache.ivy.ant" transitive="true" resolveId="jgit" pathid="jgit.classpath">
+        <ivy:dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="${jgit-version}" conf="default" />
+        <ivy:dependency org="org.slf4j" name="slf4j-nop" rev="1.7.2" conf="default" />
+      </ivy:cachepath>
       <groovy taskname="wc-checker" classpathref="jgit.classpath" src="${common.dir}/tools/src/groovy/check-working-copy.groovy"/>
       <fail if="wc.unversioned.files"
         message="Source checkout is dirty (unversioned/missing files) after running tests!!! Offending files:${line.separator}${wc.unversioned.files}"/>