From 68ad7b2eb79ac167a7688d55be457563416c701998b1bacc5ec40cf94390af63 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Mon, 21 Oct 2013 08:41:08 +0000
Subject: [PATCH] pre-update

OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=8
---
 hamcrest-1.1-build.patch          |  42 --------
 hamcrest-1.1-no-integration.patch |  41 -------
 hamcrest-1.1-no-jarjar.patch      |  26 -----
 hamcrest-1.1.tar.bz2              |   3 -
 hamcrest-all-1.1.pom              |  12 ---
 hamcrest-core-1.1.pom             |  12 ---
 hamcrest-generator-1.1.pom        |  20 ----
 hamcrest-integration-1.1.pom      |  20 ----
 hamcrest-library-1.1.pom          |  20 ----
 hamcrest-parent-1.1.pom           | 170 ------------------------------
 hamcrest-text-1.1.pom             |  20 ----
 11 files changed, 386 deletions(-)
 delete mode 100644 hamcrest-1.1-build.patch
 delete mode 100644 hamcrest-1.1-no-integration.patch
 delete mode 100644 hamcrest-1.1-no-jarjar.patch
 delete mode 100644 hamcrest-1.1.tar.bz2
 delete mode 100644 hamcrest-all-1.1.pom
 delete mode 100644 hamcrest-core-1.1.pom
 delete mode 100644 hamcrest-generator-1.1.pom
 delete mode 100644 hamcrest-integration-1.1.pom
 delete mode 100644 hamcrest-library-1.1.pom
 delete mode 100644 hamcrest-parent-1.1.pom
 delete mode 100644 hamcrest-text-1.1.pom

diff --git a/hamcrest-1.1-build.patch b/hamcrest-1.1-build.patch
deleted file mode 100644
index ac7efb3..0000000
--- a/hamcrest-1.1-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- build.xml.sav0	2007-06-30 15:03:43.000000000 +0200
-+++ build.xml	2008-02-14 12:07:25.000000000 +0100
-@@ -26,17 +26,17 @@
-         <java-to-jar srcdir="hamcrest-generator/src/main/java"
-                      destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
-                      classpath="
--                       lib/generator/qdox-1.6.1.jar;
-+                       lib/generator/qdox.jar;
-                      "/>
-         <taskdef name="jarjar"
-                  classname="com.tonicsystems.jarjar.JarJarTask"
--                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
-+                 classpath="lib/generator/jarjar.jar"/>
-         <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
-              about it's existence. Uses JarJar to place classes under a different package
-              to prevent conflict. -->
-         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-             <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
--            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
-+            <zipfileset src="lib/generator/qdox.jar"/>
-             <rule pattern="com.thoughtworks.qdox.**"
-                   result="org.hamcrest.generator.qdox.@1"/>
-         </jarjar>
-@@ -211,7 +211,7 @@
- 	<target name="javadoc" depends="library">
- 		<mkdir dir="build/javadoc"/>
- 		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
--			overview="overview.html">
-+			>
- 			
-             <classpath>
-                 <fileset dir="lib/integration">
-@@ -223,7 +223,8 @@
- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
- 			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- 			<packageset dir="hamcrest-integration/src/main/java"/>
--			<packageset dir="build/generated-code"/>
-+			<packageset dir="build/temp/hamcrest-core/generated-code"/>
-+			<packageset dir="build/temp/hamcrest-library/generated-code"/>
- 			
- 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
- 			<group title="Matcher Library" packages="org.hamcrest.*"/>
diff --git a/hamcrest-1.1-no-integration.patch b/hamcrest-1.1-no-integration.patch
deleted file mode 100644
index 2c76c40..0000000
--- a/hamcrest-1.1-no-integration.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- hamcrest-1.1/build.xml~	2008-10-24 11:37:35.000000000 -0400
-+++ hamcrest-1.1/build.xml	2008-10-24 11:39:22.839767600 -0400
-@@ -147,14 +147,13 @@
-     </target>
- 
-     <target name="bigjar"
--            depends="core, library, text, integration, generator"
-+            depends="core, library, text, generator"
-             description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration.">
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
-             <zipfileset src="build/hamcrest-core-${version}.jar"/>
-             <zipfileset src="build/hamcrest-library-${version}.jar"/>
-             <zipfileset src="build/hamcrest-text-${version}.jar"/>
-             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
--            <zipfileset src="build/hamcrest-integration-${version}.jar"/>
-         </jar>
-     </target>
- 
-@@ -201,22 +200,15 @@
- 		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
- 			>
- 			
--            <classpath>
--                <fileset dir="lib/integration">
--                    <include name="*.jar"/>
--                </fileset>
--            </classpath>
- 
- 			<packageset dir="hamcrest-core/src/main/java"/>
- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
- 			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
--			<packageset dir="hamcrest-integration/src/main/java"/>
- 			<packageset dir="build/temp/hamcrest-core/generated-code"/>
- 			<packageset dir="build/temp/hamcrest-library/generated-code"/>
- 			
- 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
- 			<group title="Matcher Library" packages="org.hamcrest.*"/>
--			<group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
- 			
- 			<link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- 			<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
diff --git a/hamcrest-1.1-no-jarjar.patch b/hamcrest-1.1-no-jarjar.patch
deleted file mode 100644
index 330c6c5..0000000
--- a/hamcrest-1.1-no-jarjar.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- hamcrest-1.1/build.xml.jarjar	2008-10-24 11:35:30.171892280 -0400
-+++ hamcrest-1.1/build.xml	2008-10-24 11:36:07.667890720 -0400
-@@ -24,22 +24,10 @@
-     <target name="generator"
-             description="Build code generator tool">
-         <java-to-jar srcdir="hamcrest-generator/src/main/java"
--                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
-+                     destjar="build/hamcrest-generator-${version}.jar"
-                      classpath="
-                        lib/generator/qdox.jar;
-                      "/>
--        <taskdef name="jarjar"
--                 classname="com.tonicsystems.jarjar.JarJarTask"
--                 classpath="lib/generator/jarjar.jar"/>
--        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
--             about it's existence. Uses JarJar to place classes under a different package
--             to prevent conflict. -->
--        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
--            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
--            <zipfileset src="lib/generator/qdox.jar"/>
--            <rule pattern="com.thoughtworks.qdox.**"
--                  result="org.hamcrest.generator.qdox.@1"/>
--        </jarjar>
-     </target>
- 
-     <target name="core"
diff --git a/hamcrest-1.1.tar.bz2 b/hamcrest-1.1.tar.bz2
deleted file mode 100644
index 48418ec..0000000
--- a/hamcrest-1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d51dbfc3a2c42d0d3d6251e706ab072ca19815a77d6a92b99809b5babce9ab9
-size 1582086
diff --git a/hamcrest-all-1.1.pom b/hamcrest-all-1.1.pom
deleted file mode 100644
index 629326d..0000000
--- a/hamcrest-all-1.1.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-all</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest All</name>
-
-</project>
diff --git a/hamcrest-core-1.1.pom b/hamcrest-core-1.1.pom
deleted file mode 100644
index ebf6e56..0000000
--- a/hamcrest-core-1.1.pom
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest Core</name>
-
-</project>
diff --git a/hamcrest-generator-1.1.pom b/hamcrest-generator-1.1.pom
deleted file mode 100644
index 893569c..0000000
--- a/hamcrest-generator-1.1.pom
+++ /dev/null
@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-generator</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest Generator</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/hamcrest-integration-1.1.pom b/hamcrest-integration-1.1.pom
deleted file mode 100644
index 52e3434..0000000
--- a/hamcrest-integration-1.1.pom
+++ /dev/null
@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-integration</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest Integration</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/hamcrest-library-1.1.pom b/hamcrest-library-1.1.pom
deleted file mode 100644
index 462f178..0000000
--- a/hamcrest-library-1.1.pom
+++ /dev/null
@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-library</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest Library</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/hamcrest-parent-1.1.pom b/hamcrest-parent-1.1.pom
deleted file mode 100644
index 4a8ffab..0000000
--- a/hamcrest-parent-1.1.pom
+++ /dev/null
@@ -1,170 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.hamcrest</groupId>
-  <artifactId>hamcrest-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1.1</version>
-  <name>Hamcrest Parent</name>
-
-  <inceptionYear>2006</inceptionYear>
-  <organization>
-    <name>Hamcrest</name>
-    <url>http://code.google.com/p/hamcrest</url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>BSD style</name>
-      <url>http://www.opensource.org/licenses/bsd-license.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <developerConnection>scm:svn:https://hamcrest.googlecode.com/svn/tags/hamcrest-packaging-maven-1.1</developerConnection>
-    <url>https://hamcrest.googlecode.com/svn/tags/hamcrest-packaging-maven-1.1</url>
-  </scm>
-
-  <modules>
-    <module>hamcrest-all</module>
-    <module>hamcrest-core</module>
-    <module>hamcrest-generator</module>
-    <module>hamcrest-integration</module>
-    <module>hamcrest-library</module>
-  </modules>
-  
-  
-  <!-- NOTE:  all dependencies are declared at scope provided as they are optional -->
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>1.1.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <version>2.2</version>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
-  </dependencies>
-  
-  <distributionManagement>
-    <!--  
-      The id used must match a server id defined in ~/.m2/settings.xml
-    -->
-    <repository>
-      <id>hamcrest@repo1.maven.org</id>
-      <name>Central Maven Repository</name>
-      <url>scp://repo1.maven.org/home/projects/hamcrest/repository</url>
-    </repository>    
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <archive>
-            <compress>false</compress>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo.groovy</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-                <body>
-                  def ant = new AntBuilder()
-                  def script = "${basedir}/src/script/download-jars.sh"
-                  def version = "${release.version}"
-                  if ( version == "null" ){
-                    println("ERROR: 'release.version' property not set.")
-                  } else {
-                    println("Using release version ${release.version}")
-                  }                                      
-                  if ( new File(script).exists() ){
-                    // we are in top-level module
-                    println("Found script "+script)
-                    ant.exec(executable: script, dir: "${basedir}", 
-                            spawn: false, failifexecutionfails: true, failonerror: true){
-                      arg(value: "http://hamcrest.googlecode.com/files/")
-                      arg(value: "hamcrest-${release.version}.zip" )
-                      arg(value: "target")
-                      arg(value: "hamcrest-${release.version}")
-                    }
-                  } else {
-                    // we are in child module
-                    ant.copy(file: "${download.artifact.dir}/${artifact.name}.jar", 
-                            tofile: "${project.build.directory}/downloaded.jar", verbose: true)
-                    ant.unjar(src: "${project.build.directory}/downloaded.jar",
-                            dest: "${project.build.outputDirectory}")
-                  }
-                  </body>
-              </source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-6</version>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <tagBase>https://hamcrest.googlecode.com/svn/tags</tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
-      </extension>
-    </extensions>
-  </build>
-
-  <properties>
-    <release.version>1.1</release.version>
-    <download.dir>target</download.dir>
-    <download.name>hamcrest-${release.version}</download.name>
-    <artifact.name>${artifactId}-${release.version}</artifact.name>
-    <download.artifact.dir>${basedir}/../${download.dir}/${download.name}/${download.name}</download.artifact.dir>    
-  </properties>
-
-</project>
\ No newline at end of file
diff --git a/hamcrest-text-1.1.pom b/hamcrest-text-1.1.pom
deleted file mode 100644
index acf3863..0000000
--- a/hamcrest-text-1.1.pom
+++ /dev/null
@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <artifactId>hamcrest-text</artifactId>
-  <packaging>jar</packaging>
-  <name>Hamcrest Text</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>