[eclipse-m2e-core/1.5.0-experimental: 9/9] Update commit to build from
by Gerard Ryan
commit a9fe87c7e04589a7c3464fb7cc5c72632daf7f12
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Fri Feb 28 23:51:16 2014 +0000
Update commit to build from
eclipse-m2e-core.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index d8fb240..719aeb0 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -3,7 +3,7 @@
%global install_loc_features %{eclipse_dropins}/%{name}/eclipse/features
%global release_tag %{version}.20130601-0317
%global x_y 1.5
-%global release_dir m2e-core-a19a70e2d2be8b6382953cf847ca65d353e7fdf7
+%global release_dir m2e-core-8f1095d2e358ddda2002431f1e535d57451cad84
Name: eclipse-m2e-core
Version: 1.5.0
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 8/9] Change maven.local.repo to maven.repo.local
by Gerard Ryan
commit 15a598fa9420bc01851d7310dd60f39c22f37b15
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:48:40 2014 +0000
Change maven.local.repo to maven.repo.local
eclipse-m2e-core.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 7de15ea..d8fb240 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -267,8 +267,8 @@ sed -i -e "s/aether-connector-wagon/aether-transport-wagon/" m2e-maven-runtime/o
%build
repo=localrepo
-mvn-rpmbuild -f m2e-maven-runtime/pom.xml install -Dmaven.local.repo=${repo} -X -Dmaven.local.debug=true
-mvn-rpmbuild install javadoc:aggregate -Dmaven.local.repo=${repo} -X -Dmaven.local.debug=true
+mvn-rpmbuild -f m2e-maven-runtime/pom.xml install -Dmaven.repo.local=${repo} -X -Dmaven.local.debug=true
+mvn-rpmbuild install javadoc:aggregate -Dmaven.repo.local=${repo} -X -Dmaven.local.debug=true
%install
install -d -m 0755 %{buildroot}%{install_loc_plugins}
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 7/9] Add/remove some sedding
by Gerard Ryan
commit 3d396fb943be7bc57f0efc9c3d9c1f6417f48658
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:47:46 2014 +0000
Add/remove some sedding
eclipse-m2e-core.spec | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 90f828a..7de15ea 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -249,8 +249,6 @@ popd
find -name MANIFEST.MF \
-exec sed -i -e 's|org.slf4j.api;bundle-version=\".*\"|slf4j.api|g' {} \;
-sed -i '/setupDefaultFilters/ a setupMatchPatterns();' org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/ResourceScanner.java
-
%patch0
%patch1
%patch2
@@ -265,6 +263,7 @@ sed -i '/setupDefaultFilters/ a setupMatchPatterns();' org.eclipse.m2e.core/src/
%patch14
%patch15
+sed -i -e "s/aether-connector-wagon/aether-transport-wagon/" m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
%build
repo=localrepo
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 6/9] Fix modification to MANIFEST file
by Gerard Ryan
commit c35dd87f9efe683ab7750c6d4f9f7396156ef26d
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:46:48 2014 +0000
Fix modification to MANIFEST file
eclipse-m2e-core.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 131003d..90f828a 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -236,8 +236,8 @@ popd
# Fix OSGI generation in pom.xml for MANIFEST.MF
pushd m2e-maven-runtime/org.eclipse.m2e.maven.runtime/
- sed -i -e 's/;bundle-version=\".*/,/g' \
- -e 's/org.slf4j.api,/slf4j.api/g' pom.xml
+ sed -i -e 's/org.slf4j.api/slf4j.api,/g' \
+ -e 's/;bundle-version=\".*//g' pom.xml
# While we're here, re-allow aopalliance to be embedded in OSGi
# and exclude plexus-container-default
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 5/9] Remove pom macros for aether namespace change
by Gerard Ryan
commit c7bf42de932dea1e9871c375c95c647c19288dcf
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:45:31 2014 +0000
Remove pom macros for aether namespace change
eclipse-m2e-core.spec | 39 ---------------------------------------
1 files changed, 0 insertions(+), 39 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 6fd0f48..131003d 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -214,45 +214,6 @@ cp -p m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/resources/about_f
%pom_disable_module org.eclipse.m2e.logback.feature
%pom_disable_module org.eclipse.m2e.sdk.feature
%pom_disable_module org.eclipse.m2e.site
-%pom_disable_module org.jboss.netty m2e-maven-runtime
-
-# jetty already has OSGI info, so doesn't need to be bundled like it is
-%pom_remove_dep org.eclipse.m2e:org.jboss.netty
-%pom_add_dep io.netty:netty:3.6.6
-
-# async-http-client already has OSGI info, so doesn't need to be bundled
-# adding packaged version as a dep here causes some 'tycholock' problem
-%pom_remove_dep org.eclipse.m2e:com.ning.async-http-client
-
-# Use Eclipse Sisu. Be careful to keep the same dependency scope and
-# appropriate exclusions.
-%pom_remove_dep org.sonatype.sisu:sisu-inject-plexus m2e-maven-runtime/org.eclipse.m2e.maven.indexer
-%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus::provided m2e-maven-runtime/org.eclipse.m2e.maven.indexer
-
-%pom_remove_dep org.sonatype.sisu.inject:guice-plexus-shim m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.inject m2e-maven-runtime/org.eclipse.m2e.maven.runtime "
- <exclusions>
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
- </exclusions>"
-
-# Use Eclipse Aether
-%pom_remove_dep org.sonatype.aether:aether-connector-wagon m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-transport-wagon m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_remove_dep org.sonatype.aether:aether-impl m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-impl m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_remove_dep org.sonatype.aether:aether-connector-asynchttpclient m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-transport-http m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_add_dep org.eclipse.aether:aether-connector-basic m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-find -name *.java -exec sed -i -e "s/org.sonatype.aether/org.eclipse.aether/g" {} \;
-
-sed -i -e "s/org.sonatype.aether/org.eclipse.aether/g" m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
# Don't add version to jar names that get bundled - easier for symlinking
pushd m2e-maven-runtime
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 4/9] Organise patch sections in spec file
by Gerard Ryan
commit 635aea58e45fbb24bbd1dd34c25a98a886d5aac5
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:44:06 2014 +0000
Organise patch sections in spec file
eclipse-m2e-core.spec | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index b3d03a1..6fd0f48 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -37,9 +37,6 @@ 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
-# Exclude org.jboss.netty from the feature - causes tycho to fail
-Patch7: %{name}-m2e.feature.patch
-
# In updated lucene in F18, some methods have been renamed
Patch8: %{name}-lucene-deprecated-methods.patch
@@ -49,13 +46,11 @@ Patch9: %{name}-m2e.core-modello-version.patch
# API change in maven-indexer 5.1.1
Patch10: %{name}-indexer-5.1.1.patch
+Patch15: %{name}-NexusIndexManager.patch
# API change in aether (remove once implemented)
-Patch11: %{name}-new-eclipse-aether-api.patch
-
-# Patch org.eclipse.m2e.launching for maven 3.1.0
-# Remove this for 1.5.0 since it's an upstream patch
-Patch12: %{name}-test-maven310-launcher.patch
+Patch13: %{name}-ContextRepositorySystemSession-missing-method.patch
+Patch14: %{name}-LifecycleMappingFactory.patch
BuildArch: noarch
@@ -302,14 +297,12 @@ sed -i '/setupDefaultFilters/ a setupMatchPatterns();' org.eclipse.m2e.core/src/
%patch4
%patch5
%patch6
-%patch7
%patch8
%patch9
%patch10
-%patch11
-%patch12
-
-rm org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/FilterRepositorySystemSession.java
+%patch13
+%patch14
+%patch15
%build
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 3/9] Add new patches for aether & maven-indexer API changes
by Gerard Ryan
commit d92b1e795ef050f28f79f410e9ca19c1498c3697
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:41:16 2014 +0000
Add new patches for aether & maven-indexer API changes
...extRepositorySystemSession-missing-method.patch | 21 +++++++++++
eclipse-m2e-core-LifecycleMappingFactory.patch | 19 ++++++++++
eclipse-m2e-core-NexusIndexManager.patch | 39 ++++++++++++++++++++
3 files changed, 79 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-m2e-core-ContextRepositorySystemSession-missing-method.patch b/eclipse-m2e-core-ContextRepositorySystemSession-missing-method.patch
new file mode 100644
index 0000000..6116e98
--- /dev/null
+++ b/eclipse-m2e-core-ContextRepositorySystemSession-missing-method.patch
@@ -0,0 +1,21 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java.orig 2014-02-16 19:25:02.373428283 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java 2014-02-16 19:25:31.127643801 +0000
+@@ -159,4 +159,8 @@
+ public ArtifactDescriptorPolicy getArtifactDescriptorPolicy() {
+ return getSession().getArtifactDescriptorPolicy();
+ }
++
++ public VersionFilter getVersionFilter() {
++ return getSession().getVersionFilter();
++ }
+ }
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java.orig 2014-02-16 19:39:31.589946301 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java 2014-02-16 19:40:15.329274220 +0000
+@@ -22,6 +22,7 @@
+ import org.eclipse.aether.collection.DependencyManager;
+ import org.eclipse.aether.collection.DependencySelector;
+ import org.eclipse.aether.collection.DependencyTraverser;
++import org.eclipse.aether.collection.VersionFilter;
+ import org.eclipse.aether.repository.AuthenticationSelector;
+ import org.eclipse.aether.repository.LocalRepository;
+ import org.eclipse.aether.repository.LocalRepositoryManager;
diff --git a/eclipse-m2e-core-LifecycleMappingFactory.patch b/eclipse-m2e-core-LifecycleMappingFactory.patch
new file mode 100644
index 0000000..e196378
--- /dev/null
+++ b/eclipse-m2e-core-LifecycleMappingFactory.patch
@@ -0,0 +1,19 @@
+--- 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 @@
+ List<PluginExecutionMetadata> result = new ArrayList<PluginExecutionMetadata>();
+ all_metadatas: for(PluginExecutionMetadata metadata : metadatas) {
+ @SuppressWarnings("unchecked")
+- Map<String, String> parameters = metadata.getFilter().getParameters();
++ Map<Object, String> parameters = metadata.getFilter().getParameters();
+ if(!parameters.isEmpty()) {
+- for(String name : parameters.keySet()) {
+- String value = parameters.get(name);
++ for(Object name : parameters.keySet()) {
++ String value = (String)parameters.get(name);
+ MojoExecution setupExecution = maven.setupMojoExecution(mavenProject, execution, monitor);
+- if(!eq(value, maven.getMojoParameterValue(mavenProject, setupExecution, name, String.class, monitor))) {
++ if(!eq(value, maven.getMojoParameterValue(mavenProject, setupExecution, (String)name, String.class, monitor))) {
+ continue all_metadatas;
+ }
+ }
diff --git a/eclipse-m2e-core-NexusIndexManager.patch b/eclipse-m2e-core-NexusIndexManager.patch
new file mode 100644
index 0000000..10bed5a
--- /dev/null
+++ b/eclipse-m2e-core-NexusIndexManager.patch
@@ -0,0 +1,39 @@
+--- 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 @@
+ import org.apache.maven.index.NexusIndexer;
+ import org.apache.maven.index.SearchType;
+ import org.apache.maven.index.artifact.Gav;
+-import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
+ 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 @@
+ ai.packaging = facade.getPackaging();
+ File pomFile = facade.getPomFile();
+ File artifactFile = (pomFile != null) ? pomFile.getParentFile() : null;
+- try {
++ //try {
+ Gav gav = new Gav(key.getGroupId(), key.getArtifactId(), key.getVersion());
+ return new ArtifactContext(pomFile, artifactFile, null, ai, gav);
+- } catch(IllegalArtifactCoordinateException ex) {
+- throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1,
+- Messages.NexusIndexManager_error_unexpected, ex));
+- }
++ //} catch(IllegalArtifactCoordinateException ex) {
++ // throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1,
++ // Messages.NexusIndexManager_error_unexpected, ex));
++ //}
+ }
+
+ protected void scheduleIndexUpdate(final IRepository repository, final boolean force) {
+@@ -1319,3 +1318,9 @@
+ }
+ }
+ }
++
++class IllegalArtifactCoordinateException extends Exception {
++ public IllegalArtifactCoordinateException(String message) {
++ super(message);
++ }
++}
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 2/9] Rebase patches for 1.5.x
by Gerard Ryan
commit 5e2a9d91f9c54a91654b65cfcfda681b9d0b721b
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:35:21 2014 +0000
Rebase patches for 1.5.x
eclipse-m2e-core-archetype-archetypemanager.patch | 53 +++++++++++++++-----
eclipse-m2e-core-fix-m2e.core-manifest.patch | 16 +++---
eclipse-m2e-core-m2e.core-resourcefetcher.patch | 50 +++++++++++--------
...rg.eclipse.m2e.launching-build.properties.patch | 3 +-
4 files changed, 80 insertions(+), 42 deletions(-)
---
diff --git a/eclipse-m2e-core-archetype-archetypemanager.patch b/eclipse-m2e-core-archetype-archetypemanager.patch
index 5153e04..cfb6ca8 100644
--- a/eclipse-m2e-core-archetype-archetypemanager.patch
+++ b/eclipse-m2e-core-archetype-archetypemanager.patch
@@ -1,24 +1,24 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java.orig 2012-07-19 15:40:38.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java 2012-07-19 18:07:43.000000000 +0100
-@@ -35,7 +35,6 @@
+--- 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 @@
+ import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.classworlds.ClassWorld;
- import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.apache.maven.archetype.Archetype;
+ 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;
-@@ -385,8 +384,8 @@
- return repositoryRegistry;
- }
-
+@@ -406,8 +405,8 @@
+ /**
+ * @deprecated use {@link ArchetypeManager#getArchetyper()}
+ */
- public Archetype getArchetype() {
-- return lookup(Archetype.class);
+- return archetypeManager.getArchetyper();
+ public org.apache.maven.archetype.ArchetypeManager getArchetype() {
-+ return lookup(org.apache.maven.archetype.ArchetypeManager.class);
++ return maven.lookupComponent(org.apache.maven.archetype.ArchetypeManager.class);
}
- public ArchetypeDataSource getArchetypeDataSource(String hint) {
+ /**
--- 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 @@
@@ -61,3 +61,32 @@
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 @@
+
+ final ArchetypeArtifactManager aaMgr;
+
+- private final org.apache.maven.archetype.Archetype archetyper;
++ private final org.apache.maven.archetype.ArchetypeManager archetyper;
+
+ private final PlexusContainer container;
+
+@@ -75,7 +75,7 @@
+ this.writer = new ArchetypeCatalogsWriter();
+ try {
+ this.aaMgr = container.lookup(ArchetypeArtifactManager.class);
+- this.archetyper = container.lookup(org.apache.maven.archetype.Archetype.class);
++ this.archetyper = container.lookup(org.apache.maven.archetype.ArchetypeManager.class);
+ } catch(ComponentLookupException ex) {
+ throw new NoSuchComponentException(ex);
+ }
+@@ -246,7 +246,7 @@
+ /**
+ * @since 1.5
+ */
+- public org.apache.maven.archetype.Archetype getArchetyper() {
++ public org.apache.maven.archetype.ArchetypeManager getArchetyper() {
+ return archetyper;
+ }
+
diff --git a/eclipse-m2e-core-fix-m2e.core-manifest.patch b/eclipse-m2e-core-fix-m2e.core-manifest.patch
index 879cf9d..166c5d6 100644
--- a/eclipse-m2e-core-fix-m2e.core-manifest.patch
+++ b/eclipse-m2e-core-fix-m2e.core-manifest.patch
@@ -1,11 +1,11 @@
---- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig 2013-06-28 21:21:12.665005851 +0100
-+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF 2013-06-28 21:41:37.343691243 +0100
-@@ -13,9 +13,10 @@
- org.eclipse.m2e.archetype.common;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.m2e.maven.indexer;bundle-version="[1.4.0,1.5.0)",
- slf4j.api,
-- com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)"
-+ com.ning.async-http-client,
+--- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig 2014-02-16 19:53:39.063321131 +0000
++++ org.eclipse.m2e.core/META-INF/MANIFEST.MF 2014-02-16 19:56:46.630738257 +0000
+@@ -12,9 +12,10 @@
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)",
+ 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)",
+- slf4j.api
++ slf4j.api,
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor
Bundle-ActivationPolicy: lazy
diff --git a/eclipse-m2e-core-m2e.core-resourcefetcher.patch b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
index bdd3635..69cff79 100644
--- a/eclipse-m2e-core-m2e.core-resourcefetcher.patch
+++ b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
@@ -1,29 +1,37 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java.orig 2012-08-04 13:58:38.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java 2012-08-04 13:54:49.000000000 +0100
-@@ -44,7 +44,7 @@
- import org.codehaus.plexus.util.IOUtil;
- import org.codehaus.plexus.util.io.RawInputStreamFacade;
+--- 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 @@
+ import org.eclipse.core.runtime.NullProgressMonitor;
+ import org.eclipse.core.runtime.OperationCanceledException;
-import org.apache.maven.index.updater.AbstractResourceFetcher;
+import org.apache.maven.index.updater.ResourceFetcher;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.proxy.ProxyInfo;
- import org.apache.maven.wagon.proxy.ProxyUtils;
-@@ -59,7 +59,7 @@
- *
- * @author Benjamin Hanzelmann
- */
--public class AsyncFetcher extends AbstractResourceFetcher {
-+public class AsyncFetcher implements ResourceFetcher {
-
- private static Logger log = LoggerFactory.getLogger(AsyncFetcher.class);
-
-@@ -187,7 +187,7 @@
- }
+
+ import org.eclipse.m2e.core.internal.MavenPluginActivator;
+
+
+-public class AetherClientResourceFetcher extends AbstractResourceFetcher {
++public class AetherClientResourceFetcher implements ResourceFetcher {
+
+ 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 @@
+ aetherClient.close();
}
-- @Override
-+ //@Override
- public InputStream retrieve(String name) throws IOException, FileNotFoundException {
- final String url = buildUrl(baseUrl, name);
++ public InputStream retrieve( String name )
++ throws IOException, FileNotFoundException {
++
++ String url = baseUrl + "/" + name;
++ Response response = aetherClient.get(url);
++ Closer closer = Closer.create();
++ return closer.register(response.getInputStream());
++ }
++
+ public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
+ String url = baseUrl + "/" + name;
diff --git a/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch b/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
index 948b066..eb56331 100644
--- a/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
+++ b/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
@@ -1,11 +1,12 @@
--- org.eclipse.m2e.launching/build.properties.orig 2012-08-05 14:10:02.048873621 +0100
+++ org.eclipse.m2e.launching/build.properties 2012-08-05 14:10:23.108472544 +0100
-@@ -14,8 +14,6 @@
+@@ -14,9 +14,6 @@
.,\
plugin.properties,\
icons/,\
- org.eclipse.m2e.cliresolver.jar,\
- org.eclipse.m2e.cliresolver30.jar,\
+- org.eclipse.m2e.cliresolver31.jar,\
about.html,\
schema/
jars.compile.order = .
9Â years, 9Â months
[eclipse-m2e-core/1.5.0-experimental: 1/9] Some basic info for 1.5.0-SNAPSHOT update
by Gerard Ryan
commit dcee71defddf658d1bd261d872cd01780d2da1ef
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Wed Feb 19 20:32:01 2014 +0000
Some basic info for 1.5.0-SNAPSHOT update
eclipse-m2e-core.spec | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 616d330..b3d03a1 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -2,12 +2,12 @@
%global install_loc_plugins %{eclipse_dropins}/%{name}/eclipse/plugins
%global install_loc_features %{eclipse_dropins}/%{name}/eclipse/features
%global release_tag %{version}.20130601-0317
-%global x_y 1.4
-%global release_dir releases/%{x_y}/%{release_tag}
+%global x_y 1.5
+%global release_dir m2e-core-a19a70e2d2be8b6382953cf847ca65d353e7fdf7
Name: eclipse-m2e-core
-Version: 1.4.0
-Release: 13%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
Summary: Maven integration for Eclipse
Group: Development/Tools
@@ -122,6 +122,8 @@ BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: velocity
BuildRequires: xbean
+BuildRequires: tesla-concurrent-localrepo
+BuildRequires: aether-connector-okhttp
Requires: aether-api
Requires: aether-connector-basic
@@ -208,7 +210,7 @@ find -name '*.jar' -delete
# Copy license files so they can be installed more easily.
cp -p org.eclipse.m2e.feature/epl-v10.html .
-cp -p m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_files/LICENSE-2.0.txt .
+cp -p m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/resources/about_files/LICENSE-2.0.txt .
# These don't currently build, but don't seem to be absolutely necessary
%pom_disable_module org.eclipse.m2e.tests.common
@@ -375,6 +377,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Mon Jan 27 2014 Gerard Ryan <galileo(a)fedoraproject.org> - 1.5.0-1
+- Update to 1.5.0-SNAPSHOT
+
* Mon Jan 27 2014 Gerard Ryan <galileo(a)fedoraproject.org> - 1.4.0-13
- Fix for RHBZ#1015324: Failing to retrieve archetypes
9Â years, 9Â months
[eclipse-m2e-core] (9 commits) Created branch 1.5.0-experimental
by Gerard Ryan
The branch '1.5.0-experimental' was created.
Summary of new commits:
dcee71d... Some basic info for 1.5.0-SNAPSHOT update
5e2a9d9... Rebase patches for 1.5.x
d92b1e7... Add new patches for aether & maven-indexer API changes
635aea5... Organise patch sections in spec file
c7bf42d... Remove pom macros for aether namespace change
c35dd87... Fix modification to MANIFEST file
3d396fb... Add/remove some sedding
15a598f... Change maven.local.repo to maven.repo.local
a9fe87c... Update commit to build from
9Â years, 9Â months