[Releng] Fix strange compile failure with latest-R orbit.
diff --git a/features/org.eclipse.oomph.gitbash-feature/feature.xml b/features/org.eclipse.oomph.gitbash-feature/feature.xml
index 3db9969..c690bb9 100644
--- a/features/org.eclipse.oomph.gitbash-feature/feature.xml
+++ b/features/org.eclipse.oomph.gitbash-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.oomph.gitbash"
label="%featureName"
- version="1.18.0.qualifier"
+ version="1.19.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.oomph.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.gitbash-feature/pom.xml b/features/org.eclipse.oomph.gitbash-feature/pom.xml
index 6ca5124..0323e77 100644
--- a/features/org.eclipse.oomph.gitbash-feature/pom.xml
+++ b/features/org.eclipse.oomph.gitbash-feature/pom.xml
@@ -20,6 +20,6 @@
</parent>
<groupId>org.eclipse.oomph.features</groupId>
<artifactId>org.eclipse.oomph.gitbash</artifactId>
- <version>1.18.0-SNAPSHOT</version>
+ <version>1.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
index eb3ac09..7af46e4 100644
--- a/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.gitbash/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.oomph.gitbash;singleton:=true
-Bundle-Version: 1.17.0.qualifier
+Bundle-Version: 1.18.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,11 +17,11 @@
org.eclipse.egit.ui;bundle-version="[2.0.0,10.0.0)",
org.eclipse.mylyn.tasks.core;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
org.eclipse.mylyn.tasks.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.oomph.util;bundle-version="[1.18.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.20.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.gitbash;version="1.17.0";x-internal:=true,
- org.eclipse.oomph.gitbash.decorators;version="1.17.0";x-internal:=true,
- org.eclipse.oomph.gitbash.repository;version="1.17.0";x-internal:=true,
- org.eclipse.oomph.gitbash.revision;version="1.17.0";x-internal:=true
+Export-Package: org.eclipse.oomph.gitbash;version="1.18.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.decorators;version="1.18.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.repository;version="1.18.0";x-internal:=true,
+ org.eclipse.oomph.gitbash.revision;version="1.18.0";x-internal:=true
Automatic-Module-Name: org.eclipse.oomph.gitbash
diff --git a/plugins/org.eclipse.oomph.gitbash/pom.xml b/plugins/org.eclipse.oomph.gitbash/pom.xml
index 43602de..8e6ca7f 100644
--- a/plugins/org.eclipse.oomph.gitbash/pom.xml
+++ b/plugins/org.eclipse.oomph.gitbash/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.gitbash</artifactId>
- <version>1.17.0-SNAPSHOT</version>
+ <version>1.18.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.oomph.gitbash/src/org/eclipse/oomph/gitbash/repository/FixCRLFAction.java b/plugins/org.eclipse.oomph.gitbash/src/org/eclipse/oomph/gitbash/repository/FixCRLFAction.java
index 27759d9..d755ce4 100644
--- a/plugins/org.eclipse.oomph.gitbash/src/org/eclipse/oomph/gitbash/repository/FixCRLFAction.java
+++ b/plugins/org.eclipse.oomph.gitbash/src/org/eclipse/oomph/gitbash/repository/FixCRLFAction.java
@@ -89,6 +89,12 @@
{
processDisplay();
}
+
+ @Override
+ public void showDuration(boolean enabled)
+ {
+ processDisplay();
+ }
};
Repository targetRepository = null;
diff --git a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
index d437cba..158f273 100644
--- a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
+++ b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="Generated from Oomph" sequenceNumber="112">
+<target name="Generated from Oomph" sequenceNumber="113">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
@@ -29,7 +29,7 @@
<repository location="https://download.eclipse.org/technology/m2e/snapshots/latest"/>
<repository location="https://download.eclipse.org/technology/swtbot/snapshots"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops2/R20190602212107/repository"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository"/>
<repository location="https://download.eclipse.org/usssdk/updates/latest"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.28.0/R-3.28.0-20221120050827/repository"/>
</location>
