commit 79efd118c761c91dd85b8204b63aaf323001d183
author Ed Merks <ed.merks@gmail.com> Sat Mar 23 12:44:53 2019 +0100
committer Ed Merks <ed.merks@gmail.com> Sat Mar 23 12:44:53 2019 +0100
tree 8ed58e65dcbb7dde0d42e76923dba8d603687dfd
parent 708fad11e5f9efc6b6ff5c8d40342aa5177a6557

[Releng] Eliminate new Git deprecation warnings

plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
index a4d2b27..84aa7ec 100644
--- a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.git;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.git;version="1.12.0";x-internal:=true,
- org.eclipse.oomph.setup.git.impl;version="1.12.0";x-internal:=true,
- org.eclipse.oomph.setup.git.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.git;version="1.13.0";x-internal:=true,
+ org.eclipse.oomph.setup.git.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.oomph.setup.git.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,

plugins/org.eclipse.oomph.setup.git/pom.xml

diff --git a/plugins/org.eclipse.oomph.setup.git/pom.xml b/plugins/org.eclipse.oomph.setup.git/pom.xml
index 9de04f1..f4b65a9 100644
--- a/plugins/org.eclipse.oomph.setup.git/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.git/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.git</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

plugins/org.eclipse.oomph.setup.git/src/org/eclipse/oomph/setup/git/impl/GitCloneTaskImpl.java

diff --git a/plugins/org.eclipse.oomph.setup.git/src/org/eclipse/oomph/setup/git/impl/GitCloneTaskImpl.java b/plugins/org.eclipse.oomph.setup.git/src/org/eclipse/oomph/setup/git/impl/GitCloneTaskImpl.java
index 8c6f5f4..09be191 100644
--- a/plugins/org.eclipse.oomph.setup.git/src/org/eclipse/oomph/setup/git/impl/GitCloneTaskImpl.java
+++ b/plugins/org.eclipse.oomph.setup.git/src/org/eclipse/oomph/setup/git/impl/GitCloneTaskImpl.java
@@ -756,7 +756,7 @@
       String pushURI = getPushURI();
       configureRepository(context, repository, checkoutBranch, isRestrictToCheckoutBranch(), remoteName, remoteURI, pushURI, getConfigSections());
 
-      hasCheckout = repository.getRefDatabase().getRef(Constants.R_HEADS + checkoutBranch) != null;
+      hasCheckout = repository.getRefDatabase().findRef(Constants.R_HEADS + checkoutBranch) != null;
       if (!hasCheckout)
       {
         cachedGit = git;
@@ -822,8 +822,8 @@
 
           if (!hasCheckout)
           {
-            Ref branchRef = cachedGit.getRepository().getRefDatabase().getRef(Constants.R_REMOTES + remoteName + "/" + checkoutBranch);
-            Ref tagRef = cachedGit.getRepository().getRefDatabase().getRef(Constants.R_TAGS + checkoutBranch);
+            Ref branchRef = cachedGit.getRepository().getRefDatabase().findRef(Constants.R_REMOTES + remoteName + "/" + checkoutBranch);
+            Ref tagRef = cachedGit.getRepository().getRefDatabase().findRef(Constants.R_TAGS + checkoutBranch);
             if (branchRef == null && tagRef != null)
             {
               createTag(context, cachedGit, checkoutBranch);