Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml2
-rw-r--r--org.eclipse.m2e.binaryproject.tests/pom.xml21
-rw-r--r--org.eclipse.m2e.core.ui/plugin.xml16
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java2
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/ChangeCreator.java2
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java6
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java3
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java17
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/plexusbuildapi/AbstractEclipseBuildContext.java3
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java1
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/AnnotationMappingMetadataSource.java2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenConfigurationImpl.java12
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/conversion/ProjectConversionParticipantSorter.java2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryReader.java5
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java2
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/strategy/M2EConnectorDiscoveryExtensionReader.java2
-rw-r--r--org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.editor.xml/plugin.xml6
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomModelHandler.java11
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java2
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java10
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java20
-rw-r--r--org.eclipse.m2e.importer.tests/pom.xml17
-rw-r--r--org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java6
-rw-r--r--org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java3
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java8
-rw-r--r--org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java6
-rw-r--r--org.eclipse.m2e.site/pom.xml1
-rw-r--r--org.eclipse.m2e.sourcelookup.ui/plugin.xml5
-rw-r--r--org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.sourcelookup/src/org/eclipse/m2e/sourcelookup/internal/launch/MavenArtifactIdentifier.java4
-rw-r--r--pom.xml12
34 files changed, 104 insertions, 113 deletions
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
index cc48be94..6cc2f217 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -31,7 +31,7 @@
<maven-core.version>3.6.1</maven-core.version>
<!-- below are m2e-specific addons -->
<plexus-build-api.version>0.0.7</plexus-build-api.version>
- <okhttp-connector.version>0.17.4</okhttp-connector.version>
+ <okhttp-connector.version>0.17.6</okhttp-connector.version>
</properties>
<dependencies>
diff --git a/org.eclipse.m2e.binaryproject.tests/pom.xml b/org.eclipse.m2e.binaryproject.tests/pom.xml
index fcc6110e..db22d70c 100644
--- a/org.eclipse.m2e.binaryproject.tests/pom.xml
+++ b/org.eclipse.m2e.binaryproject.tests/pom.xml
@@ -19,25 +19,4 @@
<artifactId>org.eclipse.m2e.binaryproject.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=541403 -->
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>javax.annotation</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project> \ No newline at end of file
diff --git a/org.eclipse.m2e.core.ui/plugin.xml b/org.eclipse.m2e.core.ui/plugin.xml
index fbc84159..4b5dcea3 100644
--- a/org.eclipse.m2e.core.ui/plugin.xml
+++ b/org.eclipse.m2e.core.ui/plugin.xml
@@ -214,7 +214,21 @@
<objectState name="name" value="pom.xml"/>
</visibility>
</objectContribution>
-
+ <objectContribution id="org.eclipse.m2e.core.fileMenu.updateProjectAction"
+ objectClass="org.eclipse.core.resources.IFile"
+ adaptable="true">
+ <action id="org.eclipse.m2e.updateProjectAction"
+ class="org.eclipse.m2e.core.ui.internal.actions.UpdateMavenProjectAction"
+ label="%m2.popup.UpdateMavenProjectAction"
+ style="push"
+ menubarPath="org.eclipse.m2e.core.fileMenu/update"
+ enablesFor="1"/>
+ <visibility>
+ <and>
+ <objectState name="name" value="pom.xml"/>
+ </and>
+ </visibility>
+ </objectContribution>
<!-- MNGECLIPSE-2564 -for *not* maven project, add the Convert to Maven Project action -->
<objectContribution id="org.eclipse.m2e.enableNatureAction"
objectClass="org.eclipse.core.resources.IProject"
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
index 4cb6d17a..6bbd3a72 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java
@@ -60,7 +60,7 @@ public class M2EUIPluginActivator extends AbstractUIPlugin {
// Create the preference store lazily.
if(preferenceStore == null) {
// InstanceScope.INSTANCE added in 3.7
- preferenceStore = new ScopedPreferenceStore(new InstanceScope(), IMavenConstants.PLUGIN_ID);
+ preferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, IMavenConstants.PLUGIN_ID);
}
return preferenceStore;
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/ChangeCreator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/ChangeCreator.java
index 4b473879..f1e9f727 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/ChangeCreator.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/ChangeCreator.java
@@ -141,7 +141,7 @@ public class ChangeCreator {
IRegion lineRegion;
lineRegion = document.getLineInformation(line);
String lineContents = document.get(lineRegion.getOffset(), lineRegion.getLength());
- hash = new Integer(computeDJBHash(lineContents));
+ hash = Integer.valueOf(computeDJBHash(lineContents));
hashes.set(line, hash);
}
return hash;
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java
index e08fb8d2..294218e2 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/ControlDecoration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
+ * Copyright (c) 2008, 2019 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -125,12 +125,12 @@ public class ControlDecoration {
/**
* Registered selection listeners.
*/
- ListenerList selectionListeners = new ListenerList();
+ ListenerList<SelectionListener> selectionListeners = new ListenerList<>();
/**
* Registered menu detect listeners.
*/
- ListenerList menuDetectListeners = new ListenerList();
+ ListenerList<MenuDetectListener> menuDetectListeners = new ListenerList<>();
/**
* The focus listener
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
index e8d735c8..54fa901b 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
@@ -29,6 +29,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbenchCommandConstants;
import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
import org.apache.lucene.queryParser.QueryParser;
@@ -113,7 +114,7 @@ public class ProposalUtil {
ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter( //
control, contentAdapter, proposalProvider, //
- ContentAssistCommandAdapter.CONTENT_PROPOSAL_COMMAND, null);
+ IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, null);
// ContentProposalAdapter adapter = new ContentProposalAdapter(control, contentAdapter, //
// proposalProvider, KeyStroke.getInstance(SWT.MOD1, ' '), null);
adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 5cc20d05..efbe0d23 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.core.resources;bundle-version="3.9.0",
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava;bundle-version="[27.1,28.0)"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
index 69772dd7..faf149ed 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
@@ -47,7 +47,6 @@ import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
import org.apache.maven.archetype.source.ArchetypeDataSource;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.execution.MavenSession;
@@ -57,6 +56,7 @@ import org.apache.maven.index.updater.IndexUpdater;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.project.DefaultProjectBuilder;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.legacy.WagonManager;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
index b1c7d788..eb5919d3 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
+ * Copyright (c) 2008, 2019 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.apache.maven.archetype.ArchetypeManager;
+import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Reader;
import org.apache.maven.archetype.source.ArchetypeDataSource;
@@ -247,15 +248,13 @@ public abstract class ArchetypeCatalogFactory {
final String remoteUrl = url;
@SuppressWarnings("serial")
ArchetypeCatalog catalogWrapper = new ArchetypeCatalog() {
- public void addArchetype(org.apache.maven.archetype.catalog.Archetype archetype) {
+ public void addArchetype(Archetype archetype) {
catalog.addArchetype(archetype);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
- public List getArchetypes() {
- List<org.apache.maven.archetype.catalog.Archetype> archetypes = new ArrayList<org.apache.maven.archetype.catalog.Archetype>(
- catalog.getArchetypes());
- for(org.apache.maven.archetype.catalog.Archetype arch : archetypes) {
+ public List<Archetype> getArchetypes() {
+ List<Archetype> archetypes = new ArrayList<>(catalog.getArchetypes());
+ for(Archetype arch : archetypes) {
if(arch.getRepository() == null || arch.getRepository().trim().isEmpty()) {
arch.setRepository(remoteUrl);
}
@@ -267,7 +266,7 @@ public abstract class ArchetypeCatalogFactory {
return catalog.getModelEncoding();
}
- public void removeArchetype(org.apache.maven.archetype.catalog.Archetype archetype) {
+ public void removeArchetype(Archetype archetype) {
catalog.removeArchetype(archetype);
}
@@ -275,7 +274,7 @@ public abstract class ArchetypeCatalogFactory {
catalog.setModelEncoding(modelEncoding);
}
- public void setArchetypes(List archetypes) {
+ public void setArchetypes(List<Archetype> archetypes) {
catalog.setArchetypes(archetypes);
}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/plexusbuildapi/AbstractEclipseBuildContext.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/plexusbuildapi/AbstractEclipseBuildContext.java
index 4e85712d..4053dd84 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/plexusbuildapi/AbstractEclipseBuildContext.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/plexusbuildapi/AbstractEclipseBuildContext.java
@@ -94,14 +94,17 @@ public abstract class AbstractEclipseBuildContext implements BuildContext, IIncr
/**
* @deprecated Use addMessage instead
*/
+ @Deprecated
@Override
public void addError(File file, int line, int column, String message, Throwable cause) {
addMessage(file, line, column, message, BuildContext.SEVERITY_ERROR, cause);
}
/**
+ * @deprecated
* @deprecated Use addMessage instead
*/
+ @Deprecated
@Override
public void addWarning(File file, int line, int column, String message, Throwable cause) {
addMessage(file, line, column, message, BuildContext.SEVERITY_WARNING, cause);
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
index 16a5b901..614c7587 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
@@ -78,6 +78,7 @@ public class AetherClientResourceFetcher extends AbstractResourceFetcher {
aetherClient.close();
}
+ @Deprecated
public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
String url = baseUrl + "/" + name;
try (Response response = aetherClient.get(url);
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/AnnotationMappingMetadataSource.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/AnnotationMappingMetadataSource.java
index aaf1fd23..75642a73 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/AnnotationMappingMetadataSource.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/AnnotationMappingMetadataSource.java
@@ -220,7 +220,7 @@ public class AnnotationMappingMetadataSource implements MappingMetadataSource {
return pis;
}
- private static final Splitter PI_SPLITTER = Splitter.on(CharMatcher.WHITESPACE).omitEmptyStrings().limit(2);
+ private static final Splitter PI_SPLITTER = Splitter.on(CharMatcher.whitespace()).omitEmptyStrings().limit(2);
private static final Splitter EXECUTE_SPLITTER = Splitter.on(',').omitEmptyStrings();
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenConfigurationImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenConfigurationImpl.java
index bb453db0..1b214b43 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenConfigurationImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenConfigurationImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2015 Sonatype, Inc.
+ * Copyright (c) 2008, 2019 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChange
import org.eclipse.core.runtime.preferences.IPreferenceFilter;
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.core.runtime.preferences.PreferenceFilterEntry;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -49,7 +50,7 @@ public class MavenConfigurationImpl implements IMavenConfiguration, IPreferenceC
private final IPreferencesService preferenceStore;
- private final ListenerList listeners = new ListenerList(ListenerList.IDENTITY);
+ private final ListenerList<IMavenConfigurationChangeListener> listeners = new ListenerList<>(ListenerList.IDENTITY);
public MavenConfigurationImpl() {
preferenceStore = Platform.getPreferencesService();
@@ -182,9 +183,9 @@ public class MavenConfigurationImpl implements IMavenConfiguration, IPreferenceC
public void preferenceChange(PreferenceChangeEvent event) {
MavenConfigurationChangeEvent mavenEvent = new MavenConfigurationChangeEvent(event.getKey(), event.getNewValue(),
event.getOldValue());
- for(Object listener : listeners.getListeners()) {
+ for(IMavenConfigurationChangeListener listener : listeners) {
try {
- ((IMavenConfigurationChangeListener) listener).mavenConfigurationChange(mavenEvent);
+ listener.mavenConfigurationChange(mavenEvent);
} catch(Exception e) {
log.error("Could not deliver maven configuration change event", e);
}
@@ -206,8 +207,7 @@ public class MavenConfigurationImpl implements IMavenConfiguration, IPreferenceC
return new String[] {InstanceScope.SCOPE, DefaultScope.SCOPE};
}
- @SuppressWarnings("rawtypes")
- public Map getMapping(String scope) {
+ public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
return null;
}
};
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/conversion/ProjectConversionParticipantSorter.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/conversion/ProjectConversionParticipantSorter.java
index b1e91344..31d91ed1 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/conversion/ProjectConversionParticipantSorter.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/conversion/ProjectConversionParticipantSorter.java
@@ -102,7 +102,7 @@ public class ProjectConversionParticipantSorter {
}
//Add edges
- for(Vertex converterVx : dag.getVerticies()) {
+ for(Vertex converterVx : dag.getVertices()) {
String converterId = converterVx.getLabel();
AbstractProjectConversionParticipant converter = converterMap.get(converterId);
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryReader.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryReader.java
index 50c2ac00..d764ae4b 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryReader.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryReader.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.service.packageadmin.PackageAdmin;
@@ -120,8 +121,6 @@ public class ProjectRegistryReader {
public void writeWorkspaceState(ProjectRegistry state) {
final ClassLoader thisClassloader = getClass().getClassLoader();
- final PackageAdmin packageAdmin = getPackageAdmin();
-
ObjectOutputStream os = null;
try {
os = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(stateFile))) {
@@ -157,7 +156,7 @@ public class ProjectRegistryReader {
}
// foreign class
- Bundle bundle = packageAdmin.getBundle(cl);
+ Bundle bundle = FrameworkUtil.getBundle(cl);
if(bundle != null) {
writeObject(bundle.getSymbolicName());
writeObject(bundle.getVersion().toString());
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java
index 5eb1b7eb..11f195f5 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java
@@ -64,7 +64,7 @@ public class MavenDiscovery {
private static final String DEFAULT_BASEURL = "http://download.eclipse.org/technology/m2e/discovery/"; //$NON-NLS-1$
- private static final String DEFAULT_FILENAME = "directory-1.10.xml"; //$NON-NLS-1$
+ private static final String DEFAULT_FILENAME = "directory-1.12.xml"; //$NON-NLS-1$
public static final String DEFAULT_URL = DEFAULT_BASEURL + DEFAULT_FILENAME;
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/strategy/M2EConnectorDiscoveryExtensionReader.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/strategy/M2EConnectorDiscoveryExtensionReader.java
index 2a6003e3..35c00e91 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/strategy/M2EConnectorDiscoveryExtensionReader.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/strategy/M2EConnectorDiscoveryExtensionReader.java
@@ -70,7 +70,7 @@ public class M2EConnectorDiscoveryExtensionReader extends ConnectorDiscoveryExte
throws ValidationException {
T connectorDescriptor;
try {
- connectorDescriptor = clazz.newInstance();
+ connectorDescriptor = clazz.getDeclaredConstructor().newInstance();
} catch(Exception e) {
throw new IllegalStateException(e);
}
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index 061ca29a..70619082 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide,
org.eclipse.core.filesystem,
org.eclipse.ui.forms,
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava;bundle-version="[27.1,28.0)"
Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
org.eclipse.m2e.editor.xml.internal;x-internal:=true,
org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
diff --git a/org.eclipse.m2e.editor.xml/plugin.xml b/org.eclipse.m2e.editor.xml/plugin.xml
index f9ac97ae..dc8d0baa 100644
--- a/org.eclipse.m2e.editor.xml/plugin.xml
+++ b/org.eclipse.m2e.editor.xml/plugin.xml
@@ -176,7 +176,7 @@
contextTypeId="org.eclipse.m2e.editor.xml.templates.contextType.properties"
name="%template.encoding.name"
description="%template.encoding.description">
- <pattern>&lt;project.build.sourceEncoding&gt;${encoding}&lt;/project.build.sourceEncoding&gt;</pattern>
+ <pattern>&lt;project.build.sourceEncoding&gt;${UTF-8}&lt;/project.build.sourceEncoding&gt;</pattern>
</template>
<template id="org.eclipse.m2e.editor.xml.templates.exclusion.skeleton"
@@ -197,7 +197,7 @@
<pattern>&lt;plugin&gt;
&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
&lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
- &lt;version&gt;3.8.0&lt;/version&gt;
+ &lt;version&gt;3.8.1&lt;/version&gt;
&lt;configuration&gt;
&lt;!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --&gt;
&lt;source&gt;${cursor}1.8&lt;/source&gt;
@@ -213,7 +213,7 @@
<pattern>&lt;plugin&gt;
&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
&lt;artifactId&gt;maven-war-plugin&lt;/artifactId&gt;
- &lt;version&gt;3.2.2&lt;/version&gt;
+ &lt;version&gt;3.2.3&lt;/version&gt;
&lt;/plugin&gt;</pattern>
</template>
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomModelHandler.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomModelHandler.java
index bdcea27b..1b04428e 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomModelHandler.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomModelHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
+ * Copyright (c) 2008, 2019 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,10 +56,9 @@ public class PomModelHandler extends ModelHandlerForXML {
private static class PomModelLoader extends XMLModelLoader {
- @SuppressWarnings("unchecked")
@Override
- public List getAdapterFactories() {
- List result = new ArrayList();
+ public List<?> getAdapterFactories() {
+ List<Object> result = new ArrayList<>();
INodeAdapterFactory factory = new ModelQueryAdapterFactoryForPom();
result.add(factory);
return result;
@@ -75,8 +74,8 @@ public class PomModelHandler extends ModelHandlerForXML {
protected INodeAdapter createAdapter(INodeNotifier target) {
if(modelQueryAdapterImpl == null) {
ModelQueryAdapter mqa = (ModelQueryAdapter) super.createAdapter(target);
- modelQueryAdapterImpl = new ModelQueryAdapterImpl(mqa.getCMDocumentCache(), new PomModelQueryImpl(
- mqa.getCMDocumentCache(), mqa.getIdResolver()), mqa.getIdResolver());
+ modelQueryAdapterImpl = new ModelQueryAdapterImpl(mqa.getCMDocumentCache(),
+ new PomModelQueryImpl(mqa.getCMDocumentCache(), mqa.getIdResolver()), mqa.getIdResolver());
}
return modelQueryAdapterImpl;
}
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
index 37c08c9c..5fffad5e 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
@@ -524,7 +524,7 @@ public class MarkerHoverControl extends AbstractInformationControl
GridData layoutData = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
String linkText;
if(isMultiFix) {
- linkText = NLS.bind(Messages.PomTextHover_category_fix, new Integer(count));
+ linkText = NLS.bind(Messages.PomTextHover_category_fix, Integer.valueOf(count));
} else {
linkText = proposal.getLabel();
}
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
index 5b1fa25c..02196de3 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
@@ -833,17 +833,21 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
label.append(a.getArtifactId()).append(" : ");
- label.append(a.getBaseVersion());
+ String nodeVersion = a.getBaseVersion();
+ label.append(nodeVersion);
String premanagedVersion = DependencyManagerUtils.getPremanagedVersion(node);
- if(premanagedVersion != null && !premanagedVersion.equals(a.getBaseVersion())) {
+ if(premanagedVersion != null && !premanagedVersion.equals(nodeVersion)) {
label.append(" (managed from ").append(premanagedVersion).append(")");
}
DependencyNode winner = (DependencyNode) node.getData().get(ConflictResolver.NODE_DATA_WINNER);
if(winner != null) {
- label.append(" (omitted for conflict with ").append(winner.getArtifact().getVersion()).append(")");
+ String winnerVersion = winner.getArtifact().getVersion();
+ if(!nodeVersion.equals(winnerVersion)) {
+ label.append(" (omitted for conflict with ").append(winnerVersion).append(")");
+ }
}
if(a.getClassifier().length() > 0) {
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
index e2ca6757..796e1f8a 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
@@ -302,10 +302,11 @@ public abstract class MavenPomEditorPage extends FormPage {
//if we have multiple errors
text = NLS.bind(Messages.MavenPomEditorPage_add_desc, maxText, text);
if(markers != null) {
- String number = new Integer(markers.length - 1).toString();
+ String number = Integer.toString(markers.length - 1);
head = NLS.bind(Messages.FormUtils_click_for_details2,
maxText.length() > FormUtils.MAX_MSG_LENGTH ? maxText.substring(0, FormUtils.MAX_MSG_LENGTH)
- : maxText, number);
+ : maxText,
+ number);
} else {
head = maxText;
if(head.length() > FormUtils.MAX_MSG_LENGTH) {
@@ -351,13 +352,14 @@ public abstract class MavenPomEditorPage extends FormPage {
}
- private void setErrorMessageForMarkers(final String msg, final String tip, final int severity, final IMarker[] markers) {
+ private void setErrorMessageForMarkers(final String msg, final String tip, final int severity,
+ final IMarker[] markers) {
if(getPartControl() != null && !getPartControl().isDisposed()) {
getPartControl().getDisplay().asyncExec(new Runnable() {
public void run() {
if(!getManagedForm().getForm().isDisposed()) {
- FormHoverProvider.Execute runnable = FormHoverProvider.createHoverRunnable(getManagedForm().getForm()
- .getShell(), markers, getPomEditor().getSourcePage().getTextViewer());
+ FormHoverProvider.Execute runnable = FormHoverProvider.createHoverRunnable(
+ getManagedForm().getForm().getShell(), markers, getPomEditor().getSourcePage().getTextViewer());
if(runnable != null) {
FormUtils.setMessageWithPerformer(getManagedForm().getForm(), msg, severity, runnable);
} else {
@@ -418,8 +420,8 @@ public abstract class MavenPomEditorPage extends FormPage {
if(!(control instanceof Text || control instanceof CCombo)) {
throw new IllegalArgumentException("Not a Text or CCombo");
}
- FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
- FieldDecorationRegistry.DEC_INFORMATION);
+ FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(FieldDecorationRegistry.DEC_INFORMATION);
final ControlDecoration decoration = new ControlDecoration(control, SWT.RIGHT | SWT.TOP) {
/* (non-Javadoc)
@@ -429,8 +431,8 @@ public abstract class MavenPomEditorPage extends FormPage {
public String getDescriptionText() {
MavenProject mp = getPomEditor().getMavenProject();
if(mp != null) {
- return FormUtils.simpleInterpolate(mp, control instanceof Text ? ((Text) control).getText()
- : ((CCombo) control).getText());
+ return FormUtils.simpleInterpolate(mp,
+ control instanceof Text ? ((Text) control).getText() : ((CCombo) control).getText());
}
return "Cannot interpolate expressions, not resolvable file.";
}
diff --git a/org.eclipse.m2e.importer.tests/pom.xml b/org.eclipse.m2e.importer.tests/pom.xml
index 2fe2b039..33544cdc 100644
--- a/org.eclipse.m2e.importer.tests/pom.xml
+++ b/org.eclipse.m2e.importer.tests/pom.xml
@@ -28,23 +28,6 @@ Contributors:
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=541403 -->
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>javax.annotation</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIHarness>true</useUIHarness>
diff --git a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
index e88e8426..35cf6b99 100644
--- a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
+++ b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Red Hat Inc.
+ * Copyright (c) 2016, 2019 Red Hat Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,7 +62,7 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
@Test
public void test() throws Exception {
Set<IProject> newProjects = null;
- SmartImportJob job = new SmartImportJob(projectDirectory, Collections.EMPTY_SET, true, true);
+ SmartImportJob job = new SmartImportJob(projectDirectory, Collections.emptySet(), true, true);
Map<File, List<ProjectConfigurator>> proposals = job.getImportProposals(monitor);
Assert.assertEquals("Expected 2 projects to import", 2, proposals.size()); //$NON-NLS-1$
@@ -98,7 +98,7 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
public void testRootWithoutPom() throws Exception {
Set<IProject> newProjects = null;
// important part here is the "getParentFile()"
- SmartImportJob job = new SmartImportJob(projectDirectory.getParentFile(), Collections.EMPTY_SET, true, true);
+ SmartImportJob job = new SmartImportJob(projectDirectory.getParentFile(), Collections.emptySet(), true, true);
Map<File, List<ProjectConfigurator>> proposals = job.getImportProposals(monitor);
Assert.assertEquals("Expected 2 projects to import", 2, proposals.size()); //$NON-NLS-1$
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
index ab0ef29d..e0a2c767 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
@@ -606,7 +606,8 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
options.put(JavaCore.COMPILER_PB_FORBIDDEN_REFERENCE, JavaCore.WARNING);
}
if(JavaSettingsUtils.isPreviewFeatureAvailable) {
- options.put(JavaSettingsUtils.COMPILER_PB_ENABLE_PREVIEW_FEATURES, enablePreviewFeatures ? JavaCore.ENABLED : JavaCore.DISABLED);
+ options.put(JavaSettingsUtils.COMPILER_PB_ENABLE_PREVIEW_FEATURES,
+ enablePreviewFeatures ? JavaCore.ENABLED : JavaCore.DISABLED);
//preview features are enabled on purpose, so keep JDT quiet about it, unless specifically overridden by the user
if(jp != null && jp.getOption(JavaSettingsUtils.COMPILER_PB_REPORT_PREVIEW_FEATURES, false) == null) {
options.put(JavaSettingsUtils.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
index abd4c652..d6f8d4aa 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
+ * Copyright (c) 2008, 2019 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -305,8 +305,8 @@ public abstract class AbstractPomRefactoring extends Refactoring {
// apply changes to temp file
editingDomain.getCommandStack().execute(command);
// create text change comparing temp file and real file
- TextFileChange change = new ChangeCreator(model.getPomFile(), model.getPomBuffer().getDocument(), model
- .getTmpBuffer().getDocument(), file.getParent().getName()).createChange();
+ TextFileChange change = new ChangeCreator(model.getPomFile(), model.getPomBuffer().getDocument(),
+ model.getTmpBuffer().getDocument(), file.getParent().getName()).createChange();
res.add(change);
}
}
@@ -332,7 +332,7 @@ public abstract class AbstractPomRefactoring extends Refactoring {
try {
Resource resource = new PomResourceFactoryImpl().createResource(uri);
- resource.load(new HashMap());
+ resource.load(new HashMap<>());
return (PomResourceImpl) resource;
} catch(Exception ex) {
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
index 0c201555..61476c11 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
@@ -77,8 +77,8 @@ public class ChangeCreator {
for(int j = startLine; j <= endLine; j++ ) {
int newPos = curr.leftStart() - startLine + j;
String newText = newDocument.get(newDocument.getLineOffset(newPos), newDocument.getLineLength(newPos));
- addEdit(change, startLine, new ReplaceEdit(oldDocument.getLineOffset(j), oldDocument.getLineLength(j),
- newText));
+ addEdit(change, startLine,
+ new ReplaceEdit(oldDocument.getLineOffset(j), oldDocument.getLineLength(j), newText));
}
} else if(curr.rightLength() > 0 && curr.leftLength() == 0) {
// insert
@@ -169,7 +169,7 @@ public class ChangeCreator {
IRegion lineRegion;
lineRegion = document.getLineInformation(line);
String lineContents = document.get(lineRegion.getOffset(), lineRegion.getLength());
- hash = new Integer(computeDJBHash(lineContents));
+ hash = Integer.valueOf(computeDJBHash(lineContents));
hashes.set(line, hash);
}
return hash;
diff --git a/org.eclipse.m2e.site/pom.xml b/org.eclipse.m2e.site/pom.xml
index 41578735..5db729da 100644
--- a/org.eclipse.m2e.site/pom.xml
+++ b/org.eclipse.m2e.site/pom.xml
@@ -26,7 +26,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
diff --git a/org.eclipse.m2e.sourcelookup.ui/plugin.xml b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
index ccee9bfd..8233ce67 100644
--- a/org.eclipse.m2e.sourcelookup.ui/plugin.xml
+++ b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
@@ -87,7 +87,10 @@
</count>
<iterate
ifEmpty="false"
- operator="or">
+ operator="and">
+ <instanceof
+ value="org.eclipse.debug.core.model.DebugElement">
+ </instanceof>
<test
property="org.eclipse.jdt.launching.jdtstratum">
</test>
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
index 9e9a28e0..899f4e7d 100644
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.debug.ui;bundle-version="3.10.0",
org.eclipse.core.resources,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="[27.1,28.0)",
com.google.gson;bundle-version="2.2.4",
org.eclipse.core.variables;bundle-version="3.2.0"
Import-Package: org.slf4j;version="1.6.2"
diff --git a/org.eclipse.m2e.sourcelookup/src/org/eclipse/m2e/sourcelookup/internal/launch/MavenArtifactIdentifier.java b/org.eclipse.m2e.sourcelookup/src/org/eclipse/m2e/sourcelookup/internal/launch/MavenArtifactIdentifier.java
index af625b72..eb3776bd 100644
--- a/org.eclipse.m2e.sourcelookup/src/org/eclipse/m2e/sourcelookup/internal/launch/MavenArtifactIdentifier.java
+++ b/org.eclipse.m2e.sourcelookup/src/org/eclipse/m2e/sourcelookup/internal/launch/MavenArtifactIdentifier.java
@@ -17,6 +17,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
@@ -34,7 +35,6 @@ import org.eclipse.m2e.core.internal.index.IIndex;
import org.eclipse.m2e.core.internal.index.IndexedArtifactFile;
import org.eclipse.m2e.core.internal.index.nexus.CompositeIndex;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;
@@ -126,7 +126,7 @@ public class MavenArtifactIdentifier {
try {
String sha1 = Files.hash(file, Hashing.sha1()).toString(); // TODO use Locations for caching
URL url = new URL("https://search.maven.org/solrsearch/select?q=1:" + sha1);
- try (InputStreamReader reader = new InputStreamReader(url.openStream(), Charsets.UTF_8)) {
+ try (InputStreamReader reader = new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)) {
Set<ArtifactKey> result = new LinkedHashSet<>();
JsonObject container = new Gson().fromJson(reader, JsonObject.class);
JsonArray docs = container.get("response").getAsJsonObject().get("docs").getAsJsonArray();
diff --git a/pom.xml b/pom.xml
index fc6c8aec..c847a050 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2015 Sonatype, Inc, and others.
+ Copyright (c) 2010, 2019 Sonatype, Inc, and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -32,7 +32,7 @@
<m2e-maven-runtime.version>${project.version}</m2e-maven-runtime.version>
- <tycho-version>1.3.0</tycho-version>
+ <tycho-version>1.4.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<!-- eclipse version m2e is built against -->
@@ -78,6 +78,11 @@
<layout>p2</layout>
<url>http://download.eclipse.org/cbi/updates/license</url>
</repository>
+ <repository>
+ <id>Orbit 2019-06 M3</id>
+ <layout>p2</layout>
+ <url>https://download.eclipse.org/tools/orbit/downloads/drops/S20190521195709/repository/</url>
+ </repository>
</repositories>
<pluginRepositories>
@@ -171,7 +176,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<pomDependencies>consider</pomDependencies>
</configuration>
@@ -192,7 +196,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
+ <version>0.8.4</version>
<executions>
<execution>
<goals><goal>prepare-agent</goal></goals>

Back to the top