JBIDE-29058: fix build after TP update (#2114)

* JBIDE-29058: fix build after TP update Signed-off-by: Stephane Bouchet <sbouchet@redhat.com> * JBIDE-29058: fix build after TP update Signed-off-by: Stephane Bouchet <sbouchet@redhat.com> --------- Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>
jbosstools · Sep 13, 2023 · e16b445 · e16b445
1 parent 5a45a3a
commit e16b445
Show file tree

Hide file tree

Showing 13 changed files with 541 additions and 31 deletions.
diff --git a/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml b/features/org.jboss.tools.openshift.cdk.test.feature/feature.xml
@@ -5,7 +5,7 @@
       version="3.24.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
-	  license-feature-version="0.0.0">
+      license-feature-version="0.0.0">
 
    <description url="%descriptionURL">
       %description
@@ -19,25 +19,11 @@
       %license
    </license>
 
-   <plugin
-         id="org.jboss.tools.cdk.reddeer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.jboss.tools.openshift.cdk.server.test"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-    <plugin
-         id="org.jboss.tools.cdk.ui.bot.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/features/org.jboss.tools.openshift.test.feature/feature.xml b/features/org.jboss.tools.openshift.test.feature/feature.xml
@@ -32,12 +32,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-    <plugin
-         id="org.jboss.tools.openshift.ui.bot.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/features/pom.xml b/features/pom.xml
@@ -18,7 +18,6 @@
 		<module>org.jboss.tools.openshift.egit.integration.test.feature</module>
 		<module>org.jboss.tools.openshift.cdk.feature</module>
 		<module>org.jboss.tools.openshift.cdk.test.feature</module>
-        <module>org.jboss.tools.openshift.integration.tests.feature</module>
 		<module>org.jboss.tools.openshift.js.feature</module>
 	</modules>
 	<build>

diff --git a/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.client/META-INF/MANIFEST.MF
@@ -156,6 +156,10 @@ Export-Package: com.fasterxml.jackson.annotation,
  okhttp3.logging,
  okio,
  okio.internal,
+ org.apache.commons.compress.archivers,
+ org.apache.commons.compress.archivers.tar,
+ org.apache.commons.compress.archivers.zip,
+ org.apache.commons.compress.compressors,
  retrofit2,
  retrofit2.converter.jackson,
  retrofit2.http

diff --git a/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.openshift.ui/META-INF/MANIFEST.MF
@@ -64,7 +64,8 @@ Require-Bundle: org.jboss.tools.openshift.common.ui;bundle-version="[3.0.0,4.0.0
  org.jboss.tools.common.oauth.core,
  org.eclipse.core.net,
  org.eclipse.osgi,
- org.jboss.tools.usage
+ org.jboss.tools.usage,
+ org.apache.commons.lang3;bundle-version="3.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.jboss.tools.openshift.internal.ui;x-friends:="org.jboss.tools.openshift.test,org.jboss.tools.openshift.reddeer",

diff --git a/...jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/odo/OdoCliFactory.java b/...jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/odo/OdoCliFactory.java
@@ -12,8 +12,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import org.jboss.tools.common.util.DownloadHelper;
 import org.jboss.tools.openshift.core.odo.Odo;
+import org.jboss.tools.openshift.internal.ui.utils.DownloadHelper;
 
 /**
  * @author Red Hat Developers