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>

diff --cc org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 403c2f4638a71c4ee77f8b29ed87db995944c7ad,ca0a03ccea03c5559505345cfde270044814ddc4..24e7f29e0acdcb712175fb5d59dd65cebc96f6b1
--- 1/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@@ -7,20 -7,19 +7,20 @@@ Bundle-Vendor: %provider_nam
  Bundle-Localization: plugin
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Import-Package: org.eclipse.jgit.api;version="[3.3.0,3.4.0)",
-  org.eclipse.jgit.dircache;version="[3.3.0,3.4.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.merge;version="[3.3.0,3.4.0)",
-  org.eclipse.jgit.pgm;version="[3.3.0,3.4.0)",
-  org.eclipse.jgit.pgm.internal;version="[3.3.0,3.4.0)",
-  org.eclipse.jgit.pgm.opt;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.transport;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)",
-  org.eclipse.jgit.util.io;version="[3.3.0,3.4.0)",
+ Import-Package: org.eclipse.jgit.api;version="[3.3.1,3.4.0)",
+  org.eclipse.jgit.dircache;version="[3.3.1,3.4.0)",
+  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.merge;version="[3.3.1,3.4.0)",
+  org.eclipse.jgit.pgm;version="[3.3.1,3.4.0)",
+  org.eclipse.jgit.pgm.internal;version="[3.3.1,3.4.0)",
+  org.eclipse.jgit.pgm.opt;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.transport;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.eclipse.jgit.util.io;version="[3.3.1,3.4.0)",
   org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
   org.junit;version="[4.4.0,5.0.0)",
   org.kohsuke.args4j;version="[2.0.12,2.1.0)"

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
index a50adf91f49ce82f3f85f36480d02449f3c7dcbd,2dd784fe7f82bc440921951b9e264b01d126b360..70f8327b1f9504b35a6cf2b0e4ee8c405e81cd49
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
@@@ -810,10 -801,10 +801,11 @@@ public abstract class WorkingTreeIterat
         * @return true if content is most likely different.
         * @deprecated Use {@link #isModified(DirCacheEntry, boolean, ObjectReader)}
         */
 +      @Deprecated
        public boolean isModified(DirCacheEntry entry, boolean forceContentCheck) {
                try {
-                       return isModified(entry, forceContentCheck, null);
+                       return isModified(entry, forceContentCheck,
+                                       repository.newObjectReader());
                } catch (IOException e) {
                        throw new JGitInternalException(e.getMessage(), e);
                }