From e794fabafbddba4f8af3e45c77fc1247a7d5ed75 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:12:19 +0000
Subject: import devtoolset-3-eclipse-4.4.2-4.el7


---

diff --git a/SOURCES/eclipse-remove-xml-maven-plugin.patch b/SOURCES/eclipse-remove-xml-maven-plugin.patch
new file mode 100644
index 0000000..6d8ba91
--- /dev/null
+++ b/SOURCES/eclipse-remove-xml-maven-plugin.patch
@@ -0,0 +1,96 @@
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml.orig	2015-03-02 09:49:40.000000000 +0000
++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2015-05-12 16:08:11.264159105 +0100
+@@ -78,27 +78,25 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>xml-maven-plugin</artifactId>
+-        <version>1.0</version>
++        <artifactId>exec-maven-plugin</artifactId>
++        <version>1.2.1</version>
+         <executions>
+           <execution>
+             <id>generate-extra-iu</id>
+             <phase>verify</phase>
+             <goals>
+-              <goal>transform</goal>
++              <goal>exec</goal>
+             </goals>
+           </execution>
+         </executions>
+         <configuration>
+-          <transformationSets>
+-            <transformationSet>
+-              <dir>target</dir>
+-              <includes>
+-                <include>p2content.xml</include>
+-              </includes>
+-              <stylesheet>cp-content.xsl</stylesheet>
+-            </transformationSet>
+-          </transformationSets>
++          <executable>xsltproc</executable>
++          <arguments>
++            <argument>-o</argument>
++            <argument>${basedir}/target/generated-resources/xml/xslt/p2content.xml</argument>
++            <argument>cp-content.xsl</argument>
++            <argument>target/p2content.xml</argument>
++          </arguments>
+         </configuration>
+       </plugin>
+       <plugin>
+@@ -112,6 +110,7 @@
+               <goal>copy-resources</goal>
+             </goals>
+             <configuration>
++              <overwrite>true</overwrite>
+               <outputDirectory>${basedir}/target</outputDirectory>
+               <resources>
+                 <resource>
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig	2015-05-12 16:41:16.024179917 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	2015-05-12 16:44:20.515776881 +0100
+@@ -39,27 +39,25 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>xml-maven-plugin</artifactId>
+-        <version>1.0</version>
++        <artifactId>exec-maven-plugin</artifactId>
++        <version>1.2.1</version>
+         <executions>
+           <execution>
+             <id>generate-extra-iu</id>
+             <phase>package</phase>
+             <goals>
+-              <goal>transform</goal>
++              <goal>exec</goal>
+             </goals>
+           </execution>
+         </executions>
+         <configuration>
+-          <transformationSets>
+-            <transformationSet>
+-              <dir>target/repository</dir>
+-              <includes>
+-                <include>content.xml</include>
+-              </includes>
+-              <stylesheet>cp-content.xsl</stylesheet>
+-            </transformationSet>
+-          </transformationSets>
++          <executable>xsltproc</executable>
++          <arguments>
++            <argument>-o</argument>
++            <argument>${basedir}/target/generated-resources/xml/xslt/content.xml</argument>
++            <argument>cp-content.xsl</argument>
++            <argument>target/repository/content.xml</argument>
++          </arguments>
+         </configuration>
+       </plugin>
+       <plugin>
+@@ -73,6 +71,7 @@
+               <goal>copy-resources</goal>
+             </goals>
+             <configuration>
++              <overwrite>true</overwrite>
+               <outputDirectory>${basedir}/target/repository</outputDirectory>
+               <resources>
+                 <resource>
diff --git a/SPECS/eclipse.spec b/SPECS/eclipse.spec
index 324311a..680c911 100644
--- a/SPECS/eclipse.spec
+++ b/SPECS/eclipse.spec
@@ -39,7 +39,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -128,6 +128,7 @@ Patch29:        eclipse-disable-jdt-annotation-java8.patch
 Patch30:        eclipse-antrun-to-exec.patch
 Patch31:        eclipse-webkit-disable-favicon-db-sooner.patch
 Patch32:        eclipse-support-scls-for-symlink-script.patch
+Patch33:        eclipse-remove-xml-maven-plugin.patch
 
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -190,7 +191,6 @@ BuildRequires: %{?scl_prefix_java_common}glassfish-jsp >= 2.2.5
 BuildRequires: %{?scl_prefix}glassfish-el >= 3.0.0
 BuildRequires: %{?scl_prefix}glassfish-servlet-api >= 3.1.0
 BuildRequires: %{?scl_prefix}cbi-plugins
-BuildRequires: xml-maven-plugin
 BuildRequires: %{?scl_prefix_maven}exec-maven-plugin
 BuildRequires: %{?scl_prefix_java_common}httpcomponents-core
 BuildRequires: %{?scl_prefix_java_common}httpcomponents-client
@@ -359,6 +359,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch30
 %patch31
 %patch32
+%patch33
 
 %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 set -x
@@ -1084,6 +1085,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Tue May 12 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.2-4
+- Resolved: rhbz#1219013 - Avoid use of xml-maven-plugin
+
 * Tue Apr 07 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.2-3
 - Resolves: rhbz#1208867 - Fix upgrade path from DTS3.0