Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDE-5116 fix manifest.mf import issue #376

Merged
merged 1 commit into from
Dec 4, 2023
+8 −11
Merged

IDE-5116 fix manifest.mf import issue #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/plugins/com.liferay.ide.gradle.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions ...m.liferay.ide.gradle.core/src/com/liferay/ide/gradle/core/LiferayProjectConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -84,7 +83,7 @@ private void _configureIfLiferayProject(final IProject project) throws CoreExcep
IProgressMonitor monitor = new NullProgressMonitor();

if (project.hasNature(JavaCore.NATURE_ID)) {
List<IClasspathEntry> classpath = Lists.newArrayList(javaProject.getRawClasspath());
List<IClasspathEntry> classpath = new ArrayList<>(Arrays.asList(javaProject.getRawClasspath()));

Map<IPath, IClasspathEntry> oldContainers = _removeOldContainers(classpath);

Expand Down Expand Up @@ -186,7 +185,7 @@ private int _indexOfNewContainers(List<IClasspathEntry> classpath) {
}

private Map<IPath, IClasspathEntry> _removeOldContainers(List<IClasspathEntry> classpath) {
Map<IPath, IClasspathEntry> retainedEntries = Maps.newLinkedHashMap();
Map<IPath, IClasspathEntry> retainedEntries = new HashMap<>();
ListIterator<IClasspathEntry> iterator = classpath.listIterator();

while (iterator.hasNext()) {
Expand Down
6 changes: 3 additions & 3 deletions tools/plugins/com.liferay.ide.gradle.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
3 changes: 1 addition & 2 deletions tools/plugins/com.liferay.ide.project.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading