diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e9ff0f8..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/org.eclipse.m2e.wtp-92025203ba06589cf6d279a9108e0aec4dbbdb40.tar.xz -/org.eclipse.m2e.wtp-acca29155656487d0b2d71aeaaefb63e3cea6526.tar.xz -/*.src.rpm -/org.eclipse.m2e.wtp-3ac337e64a56c6bfd4a3c53af77eda0b040f899d.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index ed51a2b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# eclipse-m2e-wtp - -The eclipse-m2e-wtp package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d1a4af0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Superceded by modularity package diff --git a/eclipse-m2e-wtp.spec b/eclipse-m2e-wtp.spec deleted file mode 100644 index d5fd311..0000000 --- a/eclipse-m2e-wtp.spec +++ /dev/null @@ -1,150 +0,0 @@ -%global commit 3ac337e64a56c6bfd4a3c53af77eda0b040f899d -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: eclipse-m2e-wtp -Version: 1.4.1 -Release: 4%{?dist} -Summary: Maven Integration for WTP -License: EPL-1.0 and ASL 2.0 -URL: https://www.eclipse.org/m2e-wtp/ - -Source0: https://git.eclipse.org/c/m2e-wtp/org.eclipse.m2e.wtp.git/snapshot/org.eclipse.m2e.wtp-%{commit}.tar.xz - -Patch0: war-plugin.patch - -BuildArch: noarch - -# Upstream Eclipse no longer supports non-64bit arches -ExcludeArch: s390 %{arm} %{ix86} - -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin) >= 3.2.2 -BuildRequires: mvn(org.eclipse.tycho.extras:tycho-source-feature-plugin) -BuildRequires: mvn(org.eclipse.tycho:target-platform-configuration) -BuildRequires: mvn(org.eclipse.tycho:tycho-compiler-plugin) -BuildRequires: mvn(org.eclipse.tycho:tycho-maven-plugin) -BuildRequires: mvn(org.eclipse.tycho:tycho-p2-plugin) -BuildRequires: mvn(org.eclipse.tycho:tycho-packaging-plugin) -BuildRequires: mvn(org.eclipse.tycho:tycho-source-plugin) -BuildRequires: osgi(org.apache.commons.lang3) -BuildRequires: osgi(org.eclipse.jdt.core) -BuildRequires: osgi(org.eclipse.jdt.launching) -BuildRequires: osgi(org.eclipse.jem.util) -BuildRequires: osgi(org.eclipse.jem.workbench) -BuildRequires: osgi(org.eclipse.jpt.common.core) -BuildRequires: osgi(org.eclipse.jpt.jpa.core) -BuildRequires: osgi(org.eclipse.jst.common.frameworks) -BuildRequires: osgi(org.eclipse.jst.common.project.facet.core) -BuildRequires: osgi(org.eclipse.jst.j2ee) -BuildRequires: osgi(org.eclipse.jst.j2ee.core) -BuildRequires: osgi(org.eclipse.jst.j2ee.ejb) -BuildRequires: osgi(org.eclipse.jst.j2ee.jca) -BuildRequires: osgi(org.eclipse.jst.j2ee.web) -BuildRequires: osgi(org.eclipse.jst.jee) -BuildRequires: osgi(org.eclipse.jst.jee.ejb) -BuildRequires: osgi(org.eclipse.jst.jee.web) -BuildRequires: osgi(org.eclipse.jst.jsf.core) -BuildRequires: osgi(org.eclipse.jst.ws.jaxrs.core) -BuildRequires: osgi(org.eclipse.license) -BuildRequires: osgi(org.eclipse.m2e.core) -BuildRequires: osgi(org.eclipse.m2e.jdt) -BuildRequires: osgi(org.eclipse.m2e.maven.runtime) -BuildRequires: osgi(org.eclipse.wst.common.core) -BuildRequires: osgi(org.eclipse.wst.common.emf) -BuildRequires: osgi(org.eclipse.wst.common.emfworkbench.integration) -BuildRequires: osgi(org.eclipse.wst.common.frameworks) -BuildRequires: osgi(org.eclipse.wst.common.modulecore) -BuildRequires: osgi(org.eclipse.wst.common.modulecore.ui) -BuildRequires: osgi(org.eclipse.wst.common.project.facet.core) -BuildRequires: osgi(org.eclipse.wst.server.core) -BuildRequires: osgi(org.eclipse.wst.validation) -BuildRequires: osgi(org.sonatype.m2e.mavenarchiver) -BuildRequires: osgi(slf4j.api) - -Enhances: eclipse-m2e-core - -Requires: mvn(org.apache.maven.plugins:maven-war-plugin) >= 3.2.2 - -%description -The Maven Integration for WTP project, also known as m2e-wtp, aims at -providing a tight integration between Maven Integration for Eclipse -(a.k.a m2e) and the Eclipse Web Tools Project (WTP). m2e-wtp provides -a set of m2e connectors used for the configuration of Java EE projects -in WTP, brings unique Maven features to your Eclipse IDE and helps you -convert your Eclipse projects to Maven. - -%prep -%setup -q -n org.eclipse.m2e.wtp-%{commit} -%patch0 -find -name *.jar -delete - -# Avoid relying on forge parent pom -%pom_remove_parent - -# Avoid using tycho-sourceref-jgit due to source tarball not being a git repo -%pom_remove_plugin :tycho-packaging-plugin - -# Don't need to build update sites for RPM builds -%pom_disable_module org.eclipse.m2e.wtp.site - -# Link to system version of war plugin -ln -s $(build-classpath maven-war-plugin) org.eclipse.m2e.wtp/jars -ln -s $(build-classpath maven-mapping) org.eclipse.m2e.wtp/jars - -# Make dir-shaped bundle for symlinks to system deps -echo "Eclipse-BundleShape: dir" >> org.eclipse.m2e.wtp/META-INF/MANIFEST.MF - -# Don't package parent pom -%mvn_package "::pom::" __noinstall - -%build -%mvn_build -j - -%install -%mvn_install - -pushd %{buildroot}/%{_datadir}/eclipse/droplets/m2e-wtp/plugins/org.eclipse.m2e.wtp_*/jars -rm *.jar -ln -s $(build-classpath maven-war-plugin) . -ln -s $(build-classpath maven-mapping) . -popd - -%files -f .mfiles -%doc README.md -%license org.eclipse.m2e.wtp/about.html -%license org.eclipse.m2e.wtp/about_files/LICENSE-2.0.txt - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 1.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Mar 15 2019 Mat Booth - 1.4.1-3 -- Restrict to same architectures as Eclipse itself - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Dec 12 2018 Mat Booth - 1.4.1-1 -- Update to 2018-12 release - -* Thu Jul 12 2018 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 20 2018 Mat Booth - 1.4.0-2 -- Restrict dep on maven-war-plugin - -* Wed Jun 20 2018 Mat Booth - 1.4.0-1 -- Update to latest release - -* Thu May 03 2018 Mat Booth - 1.3.3-0.4.git9202520 -- Fix failure to build with tycho 1.2.0 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.3.3-0.3.git9202520 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Oct 04 2017 Mat Booth - 1.3.3-0.2.git9202520 -- Package copy of Apache license - -* Fri Sep 29 2017 Mat Booth - 1.3.3-0.1.git9202520 -- Initial packaging - diff --git a/sources b/sources deleted file mode 100644 index b713196..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (org.eclipse.m2e.wtp-3ac337e64a56c6bfd4a3c53af77eda0b040f899d.tar.xz) = 189922e40d05e9f4d9d7dd9b7833f1e7e4bdd9a31e60b7fcef4931387f9b14cfb1b564d1079f635b7e7d5323dbdd6a9483215dec34a1a7b2e2f9a1697fa4a642 diff --git a/war-plugin.patch b/war-plugin.patch deleted file mode 100644 index fae8ecc..0000000 --- a/war-plugin.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- org.eclipse.m2e.wtp/META-INF/MANIFEST.MF.orig 2017-10-01 21:19:04.966175430 +0100 -+++ org.eclipse.m2e.wtp/META-INF/MANIFEST.MF 2017-10-01 21:19:35.997002953 +0100 -@@ -49,7 +49,7 @@ - Bundle-Activator: org.eclipse.m2e.wtp.MavenWtpPlugin - Bundle-ActivationPolicy: lazy - Bundle-Localization: plugin --Bundle-ClassPath: jars/maven-war-plugin-2.1.1.jar, -+Bundle-ClassPath: jars/maven-war-plugin.jar,jars/maven-mapping.jar, - . - Import-Package: org.apache.commons.lang3;version="3.1.0", - org.slf4j;version="1.6.2" ---- org.eclipse.m2e.wtp/build.properties.orig 2017-08-23 19:50:22.000000000 +0100 -+++ org.eclipse.m2e.wtp/build.properties 2017-10-01 21:21:25.206388828 +0100 -@@ -9,7 +9,7 @@ - about.html,\ - about.ini,\ - about.properties,\ -- jars/maven-war-plugin-2.1.1.jar,\ -+ jars/,\ - about_files/,\ - m2e-wtp_icon_32px.png,\ - NOTICE,\ ---- org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java.orig 2017-10-01 21:26:39.026608225 +0100 -+++ org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java 2017-10-01 21:28:39.107925627 +0100 -@@ -17,9 +17,9 @@ - import org.apache.maven.artifact.versioning.DefaultArtifactVersion; - import org.apache.maven.artifact.versioning.VersionRange; - import org.apache.maven.model.Plugin; --import org.apache.maven.plugin.war.Overlay; --import org.apache.maven.plugin.war.overlay.InvalidOverlayConfigurationException; --import org.apache.maven.plugin.war.overlay.OverlayManager; -+import org.apache.maven.plugins.war.Overlay; -+import org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException; -+import org.apache.maven.plugins.war.overlay.OverlayManager; - import org.apache.maven.project.MavenProject; - import org.codehaus.plexus.util.xml.Xpp3Dom; - import org.eclipse.core.resources.IFile; ---- org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java.orig 2017-10-02 09:39:23.580215267 +0100 -+++ org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/OverlayConfigurator.java 2017-10-02 09:39:33.033143318 +0100 -@@ -16,7 +16,7 @@ - - import org.apache.maven.artifact.Artifact; - import org.apache.maven.plugin.MojoExecution; --import org.apache.maven.plugin.war.Overlay; -+import org.apache.maven.plugins.war.Overlay; - import org.apache.maven.project.MavenProject; - import org.eclipse.core.resources.IProject; - import org.eclipse.core.runtime.CoreException; ---- org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java.orig 2017-10-01 21:09:48.167288404 +0100 -+++ org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/namemapping/PatternBasedFileNameMapping.java 2017-10-01 21:10:15.669135413 +0100 -@@ -9,7 +9,7 @@ - package org.eclipse.m2e.wtp.namemapping; - - import org.apache.maven.artifact.Artifact; --import org.apache.maven.plugin.war.util.MappingUtils; -+import org.apache.maven.shared.mapping.MappingUtils; - import org.codehaus.plexus.interpolation.InterpolationException; - - /** ---- org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java.orig 2018-06-20 15:34:49.640730421 +0100 -+++ org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java 2018-06-20 15:43:42.302176945 +0100 -@@ -322,8 +322,8 @@ - try { - overlayManager = new OverlayManager(getConfiguredOverlays(), - mavenProject, -- getDependentWarIncludes(), -- getDependentWarExcludes(), -+ getDependentWarIncludes().split(","), -+ getDependentWarExcludes().split(","), - currentProjectOverlay); - overlays = overlayManager.getOverlays(); - } catch(InvalidOverlayConfigurationException ex) {