[eclipse-m2e-core] Update to upstream milestone 1.6.0.20150203-1921
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Thu Mar 12 19:48:02 UTC 2015
commit e75fa7c858a8f5b68e19bf6acd8a5fa7ccfdae32
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Feb 19 16:36:41 2015 +0100
Update to upstream milestone 1.6.0.20150203-1921
...extRepositorySystemSession-missing-method.patch | 21 ------
eclipse-m2e-core-LifecycleMappingFactory.patch | 6 +-
eclipse-m2e-core-NexusIndexManager.patch | 10 +--
eclipse-m2e-core-archetype-archetypemanager.patch | 78 ++++++++++++----------
eclipse-m2e-core-artifactinfo-return-type.patch | 10 +--
eclipse-m2e-core-fix-m2e.core-manifest.patch | 14 ++--
...e-m2e-core-fix-m2e.core.ui-manifest-1.2.0.patch | 6 +-
eclipse-m2e-core-indexer-5.1.1.patch | 6 +-
eclipse-m2e-core-jetty-8.patch | 6 +-
eclipse-m2e-core-lucene-4.patch | 16 +++--
eclipse-m2e-core-lucene-deprecated-methods.patch | 8 +--
eclipse-m2e-core-m2e.core-modello-version.patch | 4 +-
eclipse-m2e-core-m2e.core-resourcefetcher.patch | 10 ++-
...rg.eclipse.m2e.launching-build.properties.patch | 12 ----
...pse-m2e-core-remotearchetypecatalogdialog.patch | 6 +-
eclipse-m2e-core.spec | 17 +++--
sources | 2 +-
17 files changed, 107 insertions(+), 125 deletions(-)
---
diff --git a/eclipse-m2e-core-LifecycleMappingFactory.patch b/eclipse-m2e-core-LifecycleMappingFactory.patch
index e196378..8c66b2e 100644
--- a/eclipse-m2e-core-LifecycleMappingFactory.patch
+++ b/eclipse-m2e-core-LifecycleMappingFactory.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java.orig 2013-08-21 20:07:30.330539109 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java 2013-08-21 20:10:36.972248347 +0100
-@@ -586,12 +586,12 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
+@@ -634,12 +634,12 @@ public class LifecycleMappingFactory {
List<PluginExecutionMetadata> result = new ArrayList<PluginExecutionMetadata>();
all_metadatas: for(PluginExecutionMetadata metadata : metadatas) {
@SuppressWarnings("unchecked")
diff --git a/eclipse-m2e-core-NexusIndexManager.patch b/eclipse-m2e-core-NexusIndexManager.patch
index 10bed5a..2c4e4bd 100644
--- a/eclipse-m2e-core-NexusIndexManager.patch
+++ b/eclipse-m2e-core-NexusIndexManager.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.orig 2013-08-21 22:40:34.509604755 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2013-08-21 22:55:01.052976833 +0100
-@@ -69,7 +69,6 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
+@@ -69,7 +69,6 @@ import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.SearchType;
import org.apache.maven.index.artifact.Gav;
@@ -8,7 +8,7 @@
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
-@@ -640,13 +639,13 @@
+@@ -640,13 +639,13 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
ai.packaging = facade.getPackaging();
File pomFile = facade.getPomFile();
File artifactFile = (pomFile != null) ? pomFile.getParentFile() : null;
@@ -27,7 +27,7 @@
}
protected void scheduleIndexUpdate(final IRepository repository, final boolean force) {
-@@ -1319,3 +1318,9 @@
+@@ -1319,3 +1318,9 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
}
}
}
diff --git a/eclipse-m2e-core-archetype-archetypemanager.patch b/eclipse-m2e-core-archetype-archetypemanager.patch
index cfb6ca8..d8aebcf 100644
--- a/eclipse-m2e-core-archetype-archetypemanager.patch
+++ b/eclipse-m2e-core-archetype-archetypemanager.patch
@@ -1,6 +1,19 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java.orig 2014-02-16 17:42:33.535701239 +0000
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java 2014-02-16 17:47:37.883953842 +0000
-@@ -40,7 +40,6 @@
+--- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
++++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
+@@ -855,7 +855,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
+ archetype.setArtifactId(archetypeArtifactId);
+ archetype.setVersion(archetypeVersion);
+ archetype.setRepository(repositoryUrl);
+- org.apache.maven.archetype.Archetype archetyper = MavenPluginActivator.getDefault().getArchetype();
++ org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault().getArchetype();
+ archetyper.updateLocalCatalog(archetype);
+
+ loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion);
+diff --git org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
+index 84b0615..ebf565e 100644
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java
+@@ -40,7 +40,6 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.classworlds.ClassWorld;
@@ -8,7 +21,7 @@
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
import org.apache.maven.archetype.source.ArchetypeDataSource;
-@@ -406,8 +405,8 @@
+@@ -402,8 +401,8 @@ public class MavenPluginActivator extends Plugin {
/**
* @deprecated use {@link ArchetypeManager#getArchetyper()}
*/
@@ -19,9 +32,11 @@
}
/**
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java.orig 2012-07-19 15:47:14.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java 2012-07-19 16:13:07.000000000 +0100
-@@ -21,7 +21,7 @@
+diff --git org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
+index dd569a0..9350a3b 100644
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
+@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
@@ -30,7 +45,7 @@
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.source.ArchetypeDataSource;
import org.apache.maven.archetype.source.ArchetypeDataSourceException;
-@@ -67,7 +67,7 @@
+@@ -69,7 +69,7 @@ public abstract class ArchetypeCatalogFactory {
return getId();
}
@@ -39,31 +54,11 @@
return MavenPluginActivator.getDefault().getArchetype();
}
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java.orig 2012-07-19 15:39:54.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java 2012-07-19 17:22:31.000000000 +0100
-@@ -768,7 +768,7 @@
- }
- }
-
-- private org.apache.maven.archetype.Archetype getArchetyper() {
-+ private org.apache.maven.archetype.ArchetypeManager getArchetyper() {
- return MavenPluginActivator.getDefault().getArchetype();
- }
-
---- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java.orig 2012-08-08 14:46:26.924975744 +0100
-+++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java 2012-08-04 14:51:10.000000000 +0100
-@@ -790,7 +790,7 @@
- archetype.setArtifactId(archetypeArtifactId);
- archetype.setVersion(archetypeVersion);
- archetype.setRepository(repositoryUrl);
-- org.apache.maven.archetype.Archetype archetyper = MavenPluginActivator.getDefault().getArchetype();
-+ org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault().getArchetype();
- archetyper.updateLocalCatalog(archetype);
-
- loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion);
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java.orig 2014-02-16 18:31:33.962586816 +0000
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java 2014-02-16 18:32:47.757137914 +0000
-@@ -65,7 +65,7 @@
+diff --git org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
+index 61e33f7..e5b93a5 100644
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
+@@ -62,7 +62,7 @@ public class ArchetypeManager {
final ArchetypeArtifactManager aaMgr;
@@ -72,7 +67,7 @@
private final PlexusContainer container;
-@@ -75,7 +75,7 @@
+@@ -72,7 +72,7 @@ public class ArchetypeManager {
this.writer = new ArchetypeCatalogsWriter();
try {
this.aaMgr = container.lookup(ArchetypeArtifactManager.class);
@@ -81,7 +76,7 @@
} catch(ComponentLookupException ex) {
throw new NoSuchComponentException(ex);
}
-@@ -246,7 +246,7 @@
+@@ -211,7 +211,7 @@ public class ArchetypeManager {
/**
* @since 1.5
*/
@@ -90,3 +85,16 @@
return archetyper;
}
+diff --git org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
+index c146497..82f2b5c 100644
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java
+@@ -886,7 +886,7 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager
+ }
+ }
+
+- private org.apache.maven.archetype.Archetype getArchetyper() {
++ private org.apache.maven.archetype.ArchetypeManager getArchetyper() {
+ return MavenPluginActivator.getDefault().getArchetype();
+ }
+
diff --git a/eclipse-m2e-core-artifactinfo-return-type.patch b/eclipse-m2e-core-artifactinfo-return-type.patch
index 2e486f9..a9a7eac 100644
--- a/eclipse-m2e-core-artifactinfo-return-type.patch
+++ b/eclipse-m2e-core-artifactinfo-return-type.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.orig 2012-07-20 13:31:11.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2012-07-20 14:30:19.000000000 +0100
-@@ -244,9 +244,9 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
+@@ -239,9 +239,9 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
}
synchronized(getIndexLock(repository)) {
@@ -13,7 +13,7 @@
}
}
} catch(Exception ex) {
-@@ -287,8 +287,8 @@
+@@ -282,8 +282,8 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
public IndexedArtifactFile identify(File file) throws CoreException {
try {
@@ -24,7 +24,7 @@
} catch(IOException ex) {
throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1,
Messages.NexusIndexManager_error_search, ex));
-@@ -1272,7 +1272,7 @@
+@@ -1276,7 +1276,7 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
Query q = getIndexer().constructQuery(MAVEN.SHA1, encode(digest), SearchType.EXACT);
diff --git a/eclipse-m2e-core-fix-m2e.core-manifest.patch b/eclipse-m2e-core-fix-m2e.core-manifest.patch
index 376d684..a29e5f2 100644
--- a/eclipse-m2e-core-fix-m2e.core-manifest.patch
+++ b/eclipse-m2e-core-fix-m2e.core-manifest.patch
@@ -1,8 +1,8 @@
---- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig 2014-06-27 21:07:29.556853222 +0200
-+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF 2014-06-27 21:07:29.605853241 +0200
-@@ -13,9 +13,10 @@
- org.eclipse.m2e.archetype.common;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.m2e.maven.indexer;bundle-version="[1.5.0,1.6.0)",
+--- org.eclipse.m2e.core/META-INF/MANIFEST.MF
++++ org.eclipse.m2e.core/META-INF/MANIFEST.MF
+@@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.9.0",
slf4j.api,
- com.google.guava;bundle-version="[14.0.1,16.0.0)"
+ org.apache.maven.archetype.catalog,
@@ -10,6 +10,6 @@
+ com.google.guava
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
- JavaSE-1.7
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7,
+ JavaSE-1.8
Export-Package: org.eclipse.m2e.core,
diff --git a/eclipse-m2e-core-fix-m2e.core.ui-manifest-1.2.0.patch b/eclipse-m2e-core-fix-m2e.core.ui-manifest-1.2.0.patch
index 14fc804..7d02802 100644
--- a/eclipse-m2e-core-fix-m2e.core.ui-manifest-1.2.0.patch
+++ b/eclipse-m2e-core-fix-m2e.core.ui-manifest-1.2.0.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF.orig 2012-12-05 17:04:07.907615274 +0000
-+++ org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF 2012-12-05 17:05:06.246473052 +0000
-@@ -36,6 +36,9 @@
+--- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
++++ org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+@@ -37,6 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.6.0,1.7.0)",
org.eclipse.ui.forms;bundle-version="3.4.1",
slf4j.api,
org.eclipse.jface.text,
diff --git a/eclipse-m2e-core-indexer-5.1.1.patch b/eclipse-m2e-core-indexer-5.1.1.patch
index bbb41cc..35c4833 100644
--- a/eclipse-m2e-core-indexer-5.1.1.patch
+++ b/eclipse-m2e-core-indexer-5.1.1.patch
@@ -1,6 +1,6 @@
---- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java.orig 2013-08-19 21:46:08.538076622 +0100
-+++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java 2013-08-19 21:50:43.831009536 +0100
-@@ -128,13 +128,15 @@
+--- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
++++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
+@@ -128,13 +128,15 @@ public class DefaultIndexerEngine
{
try
{
diff --git a/eclipse-m2e-core-jetty-8.patch b/eclipse-m2e-core-jetty-8.patch
index dfb0ad8..66f6d15 100644
--- a/eclipse-m2e-core-jetty-8.patch
+++ b/eclipse-m2e-core-jetty-8.patch
@@ -12,8 +12,8 @@
+ org.eclipse.jetty.util;bundle-version="[7,9)",
+ javax.servlet-api;bundle-version=3.1.0
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
- JavaSE-1.7
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7,
+ JavaSE-1.8
-Bundle-ClassPath: .,
- jars/javax.servlet_2.5.0.v201103041518.jar,
- jars/org.mortbay.jetty.server_6.1.23.v201012071420.jar,
@@ -21,6 +21,8 @@
Bundle-Vendor: %Bundle-Vendor
MavenArtifact-GroupId: org.eclipse.m2e
MavenArtifact-ArtifactId: org.eclipse.m2e.tests.common
+diff --git org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
+index 5851e7e..411ea74 100644
--- org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
+++ org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
@@ -7,6 +7,7 @@
diff --git a/eclipse-m2e-core-lucene-4.patch b/eclipse-m2e-core-lucene-4.patch
index b0b543d..9ed01de 100644
--- a/eclipse-m2e-core-lucene-4.patch
+++ b/eclipse-m2e-core-lucene-4.patch
@@ -1,6 +1,6 @@
---- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java.orig 2014-03-11 22:04:18.456962379 +0000
-+++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java 2014-03-11 22:06:45.318158884 +0000
-@@ -25,7 +25,8 @@
+--- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
++++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java
+@@ -25,7 +25,8 @@ import java.util.Set;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -10,7 +10,7 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
-@@ -112,10 +113,9 @@
+@@ -112,10 +113,9 @@ public class DefaultIndexerEngine
{
final HashMap<String, String> result = new HashMap<String, String>();
@@ -23,9 +23,11 @@
{
result.put( f.name(), f.stringValue() );
}
---- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java.orig 2014-03-11 22:23:08.146642930 +0000
-+++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java 2014-03-11 22:25:52.217845039 +0000
-@@ -31,7 +31,7 @@
+diff --git org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
+index e8d735c..69e42fd 100644
+--- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
++++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/util/ProposalUtil.java
+@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
diff --git a/eclipse-m2e-core-lucene-deprecated-methods.patch b/eclipse-m2e-core-lucene-deprecated-methods.patch
index a8f7d8b..ab36362 100644
--- a/eclipse-m2e-core-lucene-deprecated-methods.patch
+++ b/eclipse-m2e-core-lucene-deprecated-methods.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.orig 2012-08-09 14:40:35.716178765 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2012-08-09 14:41:19.788127390 +0100
-@@ -837,7 +837,7 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java
+@@ -843,7 +843,7 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
}
protected Directory getIndexDirectory(IRepository repository) throws IOException {
@@ -9,7 +9,7 @@
}
public IndexedArtifactGroup resolveGroup(IndexedArtifactGroup group) {
-@@ -1129,7 +1129,7 @@
+@@ -1132,7 +1132,7 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList
String details = getIndexDetails(repository);
String id = repository.getUid() + "-cache"; //$NON-NLS-1$
File luceneCache = new File(request.getLocalIndexCacheDir(), details);
diff --git a/eclipse-m2e-core-m2e.core-modello-version.patch b/eclipse-m2e-core-m2e.core-modello-version.patch
index 51a1bf1..29f5d21 100644
--- a/eclipse-m2e-core-m2e.core-modello-version.patch
+++ b/eclipse-m2e-core-m2e.core-modello-version.patch
@@ -1,5 +1,5 @@
---- org.eclipse.m2e.core/pom.xml.orig 2012-12-10 23:53:38.581824147 +0000
-+++ org.eclipse.m2e.core/pom.xml 2012-12-10 23:56:11.225728294 +0000
+--- org.eclipse.m2e.core/pom.xml
++++ org.eclipse.m2e.core/pom.xml
@@ -37,6 +37,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
diff --git a/eclipse-m2e-core-m2e.core-resourcefetcher.patch b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
index 69cff79..cb66d3c 100644
--- a/eclipse-m2e-core-m2e.core-resourcefetcher.patch
+++ b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java.orig 2014-02-16 18:48:04.738884102 +0000
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java 2014-02-16 18:49:17.567418062 +0000
-@@ -34,14 +34,14 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java
+@@ -34,14 +34,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
@@ -17,9 +17,7 @@
private AetherClient aetherClient;
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java.orig 2014-02-16 18:57:46.608176532 +0000
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java 2014-02-16 19:06:18.279005460 +0000
-@@ -73,6 +73,15 @@
+@@ -73,6 +73,15 @@ public class AetherClientResourceFetcher extends AbstractResourceFetcher {
aetherClient.close();
}
diff --git a/eclipse-m2e-core-remotearchetypecatalogdialog.patch b/eclipse-m2e-core-remotearchetypecatalogdialog.patch
index 58139ba..743bd00 100644
--- a/eclipse-m2e-core-remotearchetypecatalogdialog.patch
+++ b/eclipse-m2e-core-remotearchetypecatalogdialog.patch
@@ -1,6 +1,6 @@
---- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java.orig 2012-08-05 13:38:58.000000000 +0100
-+++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java 2012-08-05 13:44:20.000000000 +0100
-@@ -180,7 +180,7 @@
+--- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java
++++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java
+@@ -182,7 +182,7 @@ public class RemoteArchetypeCatalogDialog extends TitleAreaDialog {
} finally {
final IStatus s = status;
@SuppressWarnings("unchecked")
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 65599c9..e88b897 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -1,10 +1,10 @@
%global install_loc %{_datadir}/eclipse/dropins/m2e-core
-%global release_dir releases/1.5/1.5.0.20140606-0033
+%global release_dir milestones/1.6/1.6.0.20150203-1921
Name: eclipse-m2e-core
-Version: 1.5.0
-Release: 18%{?dist}
+Version: 1.6.0
+Release: 0.1%{?dist}
Summary: Maven integration for Eclipse
Group: Development/Tools
@@ -33,7 +33,7 @@ Patch4: %{name}-artifactinfo-return-type.patch
Patch5: %{name}-remotearchetypecatalogdialog.patch
# org.eclipse.m2e.launching tries to bundle jars, but they don't seem needed
-Patch6: %{name}-org.eclipse.m2e.launching-build.properties.patch
+#Patch6: %{name}-org.eclipse.m2e.launching-build.properties.patch
# In updated lucene in F18, some methods have been renamed
Patch8: %{name}-lucene-deprecated-methods.patch
@@ -47,7 +47,7 @@ Patch10: %{name}-indexer-5.1.1.patch
Patch15: %{name}-NexusIndexManager.patch
# API change in aether (remove once implemented)
-Patch13: %{name}-ContextRepositorySystemSession-missing-method.patch
+#Patch13: %{name}-ContextRepositorySystemSession-missing-method.patch
Patch14: %{name}-LifecycleMappingFactory.patch
# API changes in lucene 4
@@ -58,6 +58,8 @@ Patch17: %{name}-jetty-8.patch
BuildArch: noarch
+BuildRequires: eclipse-m2e-workspace
+BuildRequires: takari-lifecycle
# Maven build-requires for the main build. After successfull build
# they can be regenerated with the following command:
@@ -310,7 +312,7 @@ sed -i -e "s/aether-connector-wagon/aether-transport-wagon/" m2e-maven-runtime/o
# http://wiki.eclipse.org/M2E_Development_Environment#Building_m2e_on_command_line
repo=localrepo
xmvn -B -o install -f m2e-maven-runtime/pom.xml -Dmaven.repo.local=${repo}
-%mvn_build -- -Dmaven.repo.local=${repo}
+%mvn_build -- -Dmaven.repo.local=${repo} -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
%install
@@ -342,6 +344,9 @@ xmvn-subst -s `find %{buildroot}%{install_loc} -name jars` $extra
%changelog
+* Thu Feb 19 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6.0-0.1
+- Update to upstream milestone 1.6.0.20150203-1921
+
* Mon Feb 9 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.5.0-18
- Enable test bundle
diff --git a/sources b/sources
index 7b0bd32..3b6000c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4602cf45bd37fb7aa2cddfe504a7c8eb 1.5.0.20140606-0033.tar.bz2
+e9b4d63eefa491db761bae3782e5a35f 1.6.0.20150203-1921.tar.bz2
More information about the scm-commits
mailing list