diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index 823fe43..1de63e1 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -1,8 +1,8 @@ -%global release_dir m2e-core-db323d61161a055a1e5f200eada456650e2adddb +%global release_dir m2e-core-f13f3346eb19e1a98c0271d4b08faa6ac5c5c9b3 Name: eclipse-m2e-core -Version: 1.9.1 -Release: 2%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -37,6 +37,11 @@ Patch5: %{name}-lucene-5.patch Patch6: eclipse-m2e-maven353.patch %endif +%if 0%{?fedora} >= 30 +# Fix build against latest maven-resolver +Patch6: eclipse-m2e-maven-resolver-1.3.patch +%endif + BuildArch: noarch # Maven build-requires for the main build. After successfull build @@ -305,11 +310,22 @@ sed -i -e '/org.slf4j/s|^\(.*\)|\1,org.apache.lucene.analysis,org.apache.lucene. # Building m2e is a two step process. See upstream documentation: # 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} +xmvn -B -o package -f m2e-maven-runtime/pom.xml -Dmaven.repo.local=${repo} +# Manually install the first stage (don't rely on felix OBR) +mkdir tmp && pushd tmp +xmvn -B -o install:install-file -DgroupId=org.eclipse.m2e -DartifactId=org.eclipse.m2e.archetype.common -Dversion=%{version}-SNAPSHOT -Dpackaging=jar \ + -Dmaven.repo.local=../${repo} -Dfile=../m2e-maven-runtime/org.eclipse.m2e.archetype.common/target/org.eclipse.m2e.archetype.common-%{version}-SNAPSHOT.jar +xmvn -B -o install:install-file -DgroupId=org.eclipse.m2e -DartifactId=org.eclipse.m2e.maven.indexer -Dversion=%{version}-SNAPSHOT -Dpackaging=jar \ + -Dmaven.repo.local=../${repo} -Dfile=../m2e-maven-runtime/org.eclipse.m2e.maven.indexer/target/org.eclipse.m2e.maven.indexer-%{version}-SNAPSHOT.jar +xmvn -B -o install:install-file -DgroupId=org.eclipse.m2e -DartifactId=org.eclipse.m2e.maven.runtime -Dversion=%{version}-SNAPSHOT -Dpackaging=jar \ + -Dmaven.repo.local=../${repo} -Dfile=../m2e-maven-runtime/org.eclipse.m2e.maven.runtime/target/org.eclipse.m2e.maven.runtime-%{version}-SNAPSHOT.jar +xmvn -B -o install:install-file -DgroupId=org.eclipse.m2e -DartifactId=org.eclipse.m2e.maven.runtime.slf4j.simple -Dversion=%{version}-SNAPSHOT -Dpackaging=jar \ + -Dmaven.repo.local=../${repo} -Dfile=../m2e-maven-runtime/org.eclipse.m2e.maven.runtime.slf4j.simple/target/org.eclipse.m2e.maven.runtime.slf4j.simple-%{version}-SNAPSHOT.jar +popd +# Second stage build %mvn_build -f -- -Dmaven.repo.local=${repo} -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install - %mvn_artifact m2e-maven-runtime/$mod/pom.xml for mod in org.eclipse.m2e.archetype.common \ org.eclipse.m2e.maven.indexer \ @@ -334,8 +350,11 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %files javadoc -f .mfiles-javadoc %license epl-v10.html LICENSE-2.0.txt - %changelog +* Wed Dec 12 2018 Mat Booth - 1.10.0-1 +- Update to 2018-12 release +- Patch for latest version of maven-resolver + * Wed Sep 12 2018 Mat Booth - 1.9.1-2 - Add BR/R on maven-wagon-http diff --git a/eclipse-m2e-maven-resolver-1.3.patch b/eclipse-m2e-maven-resolver-1.3.patch new file mode 100644 index 0000000..2cdfd7a --- /dev/null +++ b/eclipse-m2e-maven-resolver-1.3.patch @@ -0,0 +1,20 @@ +--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java.orig 2018-12-12 11:26:12.687882953 +0000 ++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java 2018-12-12 11:39:46.027104311 +0000 +@@ -32,6 +32,7 @@ + import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; + import org.eclipse.aether.resolution.ResolutionErrorPolicy; + import org.eclipse.aether.transfer.TransferListener; ++import org.eclipse.aether.transform.FileTransformerManager; + + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; +@@ -176,4 +177,9 @@ + public VersionFilter getVersionFilter() { + return getSession().getVersionFilter(); + } ++ ++ @Override ++ public FileTransformerManager getFileTransformerManager() { ++ return getSession().getFileTransformerManager(); ++ } + } diff --git a/sources b/sources index aed5b18..7e66dfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2e-core-db323d61161a055a1e5f200eada456650e2adddb.tar.xz) = c11a8e3b74c9f52a085d4e4a6e82c406741a253a48ca50d8fcc6e6efc6e6b3f1385af91f7cbc9f43d6d95973609d1f11380289030a0704192f94a673dc79cb00 +SHA512 (m2e-core-f13f3346eb19e1a98c0271d4b08faa6ac5c5c9b3.tar.xz) = e2bc0f1f68cad1d8aff1ac40297b6b251ffd97ab3fd18ccaada4a16ae4a7dd2e3a4038a060b2198c87bca047dda581be3a5554c25ea866e9ed38844de57cca37