From 1af207aa61d2b81dca8808301985f15aac149c92 Mon Sep 17 00:00:00 2001 From: Simon Jiang Date: Mon, 4 Dec 2023 10:15:58 +0800 Subject: [PATCH] IDE-5116 fix manifest.mf import issue --- .../com.liferay.ide.gradle.core/META-INF/MANIFEST.MF | 1 - .../ide/gradle/core/LiferayProjectConfigurator.java | 9 ++++----- .../com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF | 6 +++--- .../com.liferay.ide.project.core/META-INF/MANIFEST.MF | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF index 4d97e928cc..2014d2ff18 100644 --- a/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: com.liferay.blade.gradle.tooling, com.liferay.ide.gradle.core, com.liferay.ide.gradle.core.model -Import-Package: com.google.common.collect Require-Bundle: biz.aQute.bndlib, com.liferay.ide.core, com.liferay.ide.project.core, diff --git a/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/LiferayProjectConfigurator.java b/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/LiferayProjectConfigurator.java index 4d6ace7d18..08d7b28e4e 100644 --- a/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/LiferayProjectConfigurator.java +++ b/tools/plugins/com.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/LiferayProjectConfigurator.java @@ -14,9 +14,6 @@ package com.liferay.ide.gradle.core; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - import com.liferay.blade.gradle.tooling.ProjectInfo; import com.liferay.ide.core.LiferayNature; import com.liferay.ide.core.util.FileUtil; @@ -28,6 +25,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.ListIterator; @@ -84,7 +83,7 @@ private void _configureIfLiferayProject(final IProject project) throws CoreExcep IProgressMonitor monitor = new NullProgressMonitor(); if (project.hasNature(JavaCore.NATURE_ID)) { - List classpath = Lists.newArrayList(javaProject.getRawClasspath()); + List classpath = new ArrayList<>(Arrays.asList(javaProject.getRawClasspath())); Map oldContainers = _removeOldContainers(classpath); @@ -186,7 +185,7 @@ private int _indexOfNewContainers(List classpath) { } private Map _removeOldContainers(List classpath) { - Map retainedEntries = Maps.newLinkedHashMap(); + Map retainedEntries = new HashMap<>(); ListIterator iterator = classpath.listIterator(); while (iterator.hasNext()) { diff --git a/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF index fa0852e93b..b26f0a740b 100644 --- a/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF @@ -20,8 +20,10 @@ Require-Bundle: com.google.guava, org.eclipse.buildship.core, org.eclipse.core.expressions, org.eclipse.core.runtime, + org.eclipse.debug.ui, org.eclipse.jdt.core, org.eclipse.jdt.core.manipulation, + org.eclipse.jdt.debug.ui, org.eclipse.jdt.launching, org.eclipse.jdt.ui, org.eclipse.jface.text, @@ -34,12 +36,10 @@ Require-Bundle: com.google.guava, org.eclipse.wst.common.project.facet.ui, org.eclipse.wst.server.core, org.eclipse.wst.server.ui, - org.eclipse.debug.ui, - org.eclipse.jdt.debug.ui + org.json Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Export-Package: com.liferay.ide.gradle.ui Service-Component: OSGI-INF/com.liferay.ide.gradle.ui.upgrade.UpdateWorkspacePluginVersionCommand.xml, OSGI-INF/com.liferay.ide.gradle.ui.upgrade.RemoveDependencyVersionCommand.xml -Import-Package: org.json diff --git a/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF b/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF index dbb009420c..e6f7b44c53 100644 --- a/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF +++ b/tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Require-Bundle: biz.aQute.bndlib, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.emf.ecore, + org.eclipse.jdt.launching, org.eclipse.jdt.core, org.eclipse.jst.common.frameworks, org.eclipse.jst.common.project.facet.core, @@ -55,8 +56,6 @@ Export-Package: com.liferay.ide.project.core, com.liferay.ide.project.core.util, com.liferay.ide.project.core.workspace, org.apache.commons.validator.routines -Import-Package: org.eclipse.jdt.launching, - org.eclipse.wst.jsdt.launching Bundle-ClassPath: lib/commons-validator-1.6.jar, lib/jackson-core-asl-1.9.13.jar, lib/jackson-mapper-asl-1.9.13.jar,