Merge branch 'stable-3.3'

* stable-3.3:
  Update scripts to deploy jgit on Maven central
  Prepare 3.3.1-SNAPSHOT builds
  JGit v3.3.0.201403021825-r
  Fix merge/cherry-picking in CRLF mode
  Expose the received pack size in ReceivePack
  Revert "Add getPackFile to ReceivePack to make PostReceiveHook more usable"
  Avoid an NPE after 7b01a5369210
  Add a launcher for Java 7 tests
  Remove obsolete getRepositoryMethod from WorkingTreeIterator
  Fix NPE when WorkingTreeIterator does not have a repository set
  Add getPackFile to ReceivePack to make PostReceiveHook more usable
  Possibility to limit the max pack size on receive-pack
  Package httpclient and httpcore in o.e.j.http.apache.feature

Change-Id: I814a150980854bbaabd767f97b062d247af6cb50
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 files changed, 36 insertions, 14 deletions

diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
index 7c4a127a9e..eeabe10b6b 100644
--- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.java7.test
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.1.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.api;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.diff;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.dircache;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.internal.storage.file;version="3.3.0",
- org.eclipse.jgit.junit;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.lib;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.revwalk;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.storage.file;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.treewalk;version="[3.3.0,3.4.0)",
- org.eclipse.jgit.util;version="[3.3.0,3.4.0)",
+Import-Package: org.eclipse.jgit.api;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.diff;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.dircache;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="3.3.1",
+ org.eclipse.jgit.junit;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.lib;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.storage.file;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.treewalk;version="[3.3.1,3.4.0)",
+ org.eclipse.jgit.util;version="[3.3.1,3.4.0)",
  org.junit;version="[4.11.0,5.0.0)"
diff --git a/org.eclipse.jgit.java7.test/org.eclipse.jgit.java7 -- Java7 feature test.launch b/org.eclipse.jgit.java7.test/org.eclipse.jgit.java7 -- Java7 feature test.launch
new file mode 100644
index 0000000000..d65d045d99
--- /dev/null
+++ b/org.eclipse.jgit.java7.test/org.eclipse.jgit.java7 -- Java7 feature test.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.jgit.java7.test"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jgit.java7.test"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.java7.test"/>
+</launchConfiguration>
diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml
index c7a045b523..a3da38f277 100644
--- a/org.eclipse.jgit.java7.test/pom.xml
+++ b/org.eclipse.jgit.java7.test/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.java7.test</artifactId>
diff --git a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java
index 484467b24c..2b2d65e9b1 100644
--- a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java
+++ b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java
@@ -114,7 +114,8 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase {
 		assertEquals("link", dci.getEntryPathString());
 
 		// test
-		assertFalse(fti.isModified(dci.getDirCacheEntry(), true));
+		assertFalse(fti.isModified(dci.getDirCacheEntry(), true,
+				db.newObjectReader()));
 	}
 
 	/**
@@ -195,6 +196,7 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase {
 		assertEquals("link", dci.getEntryPathString());
 
 		// test
-		assertTrue(fti.isModified(dci.getDirCacheEntry(), true));
+		assertTrue(fti.isModified(dci.getDirCacheEntry(), true,
+				db.newObjectReader()));
 	}
 }