rpms/hamcrest
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to latest upstream version

Browse Source
This commit is contained in:
Tomas Radej 2013-03-21 15:19:43 +01:00
parent 169d3ecf31
commit 5275b44dee
22 changed files with 164 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@ -1 +1,14 @@
hamcrest-1.1.tgz
/hamcrest-all-1.3.pom
/hamcrest-core-1.3.pom
/hamcrest-generator-1.3.pom
/hamcrest-integration-1.3.pom
/hamcrest-library-1.3.pom
/hamcrest-parent-1.3.pom
/hamcrest-text-1.3.pom
/hamcrest-core-MANIFEST.MF
/hamcrest-generator-MANIFEST.MF
/hamcrest-integration-MANIFEST.MF
/hamcrest-library-MANIFEST.MF
/hamcrest-text-MANIFEST.MF
/hamcrest-1.3.tgz

42
hamcrest-1.1-build.patch
View File

@ -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.*"/>

41
hamcrest-1.1-no-integration.patch
View File

@ -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/"/>

26
hamcrest-1.1-no-jarjar.patch
View File

@ -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"

30
hamcrest-1.3-build.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/build.xml b/build.xml
index 1cfd4fb..54d43fe 100644
--- a/build.xml
+++ b/build.xml
@@ -14,13 +14,13 @@
<target name="generator" description="Build code generator tool">
<java-to-jar srcdir="hamcrest-generator/src/main/java"
modulename="hamcrest-generator-nodeps"
- classpath="lib/generator/qdox-1.12.jar"/>
+ classpath="lib/generator/qdox.jar"/>
<!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
<jarjar jarfile="build/hamcrest-generator-${version}.jar">
<zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
- <zipfileset src="lib/generator/qdox-1.12.jar"/>
+ <zipfileset src="lib/generator/qdox.jar"/>
<rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
</jarjar>
<copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
@@ -152,7 +152,7 @@
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
+ windowtitle="Hamcrest" source="1.6" failonerror="yes">
<classpath>
<fileset dir="lib/integration">
<include name="*.jar"/>

17
hamcrest-1.3-javadoc.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/build.xml b/build.xml
index ed57763..a4550cb 100644
--- a/build.xml
+++ b/build.xml
@@ -135,11 +135,10 @@
</target>
<target name="javadoc" description="build javadoc jars">
- <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
+ <java-to-javadoc-jar modulename="hamcrest-generator"/>
<java-to-javadoc-jar modulename="hamcrest-core"/>
<java-to-javadoc-jar modulename="hamcrest-library"/>
<java-to-javadoc-jar modulename="hamcrest-integration"/>
- <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

33
hamcrest-1.3-no-integration.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/build.xml b/build.xml
index c59c9fa..e5eaa56 100644
--- a/build.xml
+++ b/build.xml
@@ -112,7 +112,7 @@
build/hamcrest-integration-${version}.jar"/>
</target>
- <target name="bigjar" depends="core, library, integration, generator"
+ <target name="bigjar" depends="core, library, generator"
description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration.">
<mkdir dir="build/temp/hamcrest-all-${version}.jar.manifest"/>
<manifest file="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF">
@@ -132,7 +132,6 @@
<zipfileset src="build/hamcrest-core-${version}-sources.jar"/>
<zipfileset src="build/hamcrest-library-${version}-sources.jar"/>
<zipfileset src="build/hamcrest-generator-${version}-sources.jar"/>
- <zipfileset src="build/hamcrest-integration-${version}-sources.jar"/>
</jar>
</target>
@@ -146,11 +145,6 @@
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
windowtitle="Hamcrest" source="1.6" failonerror="yes">
- <classpath>
- <fileset dir="lib/integration">
- <include name="*.jar"/>
- </fileset>
- </classpath>
<packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
<packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>
<packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

23
hamcrest-1.3-no-jarjar.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/build.xml b/build.xml
index 54d43fe..ed57763 100644
--- a/build.xml
+++ b/build.xml
@@ -13,17 +13,8 @@
<target name="generator" description="Build code generator tool">
<java-to-jar srcdir="hamcrest-generator/src/main/java"
- modulename="hamcrest-generator-nodeps"
+ modulename="hamcrest-generator"
classpath="lib/generator/qdox.jar"/>
-
- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
- <zipfileset src="lib/generator/qdox.jar"/>
- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
- </jarjar>
- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
</target>
<target name="core" depends="generator" description="Build core Hamcrest library">

12
hamcrest-all-1.1.pom
View File

@ -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>

12
hamcrest-core-1.1.pom
View File

@ -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>

12
hamcrest-core-MANIFEST.MF
View File

@ -1,12 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.core
Export-Package: org.hamcrest;version="1.1.0",
org.hamcrest.core;version="1.1.0",org.hamcrest.internal;version="1.
1.0";x-internal:=true
Bundle-Version: 1.1.0.v20090501071000
Bundle-ManifestVersion: 2

20
hamcrest-generator-1.1.pom
View File

@ -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>

18
hamcrest-generator-MANIFEST.MF
View File

@ -1,18 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.generator
Bundle-Version: 1.1.0.v20090501071000
Export-Package: org.hamcrest.generator;version="1.1.0",org.hamcrest.ge
nerator.config;version="1.1.0"
Bundle-ManifestVersion: 2
Import-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks
.qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi
on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor
ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio
n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor
ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru
cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3"

20
hamcrest-integration-1.1.pom
View File

@ -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>

14
hamcrest-integration-MANIFEST.MF
View File

@ -1,14 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.integration
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"
Bundle-Version: 1.1.0.v20090501071000
Export-Package: org.hamcrest;integration=split;mandatory:=integration;
version="1.1.0",org.hamcrest.integration;version="1.1.0"
Bundle-ManifestVersion: 2
Import-Package: org.easymock;version="2.4.0";resolution:=optional,org.
jmock.core;version="1.10";resolution:=optional

20
hamcrest-library-1.1.pom
View File

@ -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>

15
hamcrest-library-MANIFEST.MF
View File

@ -1,15 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.library
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"
Bundle-Version: 1.1.0.v20090501071000
Export-Package: org.hamcrest;version="1.1.0";library=split;mandatory:=
library,org.hamcrest.beans;version="1.1.0",org.hamcrest.collection;ve
rsion="1.1.0",org.hamcrest.number;version="1.1.0",org.hamcrest.object
;version="1.1.0",org.hamcrest.text;version="1.1.0",org.hamcrest.xml;v
ersion="1.1.0"
Bundle-ManifestVersion: 2

170
hamcrest-parent-1.1.pom
View File

@ -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>

20
hamcrest-text-1.1.pom
View File

@ -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>

14
hamcrest-text-MANIFEST.MF
View File

@ -1,14 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.text
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",org.hamcrest.
library;bundle-version="1.1.0"
Bundle-Version: 1.1.0.v20090501071000
Export-Package: org.hamcrest.text.pattern;version="1.1.0",org.hamcrest
.text.pattern.internal.ast;version="1.1.0";x-internal:=true,org.hamcr
est.text.pattern.internal.naming;version="1.1.0";x-internal:=true
Bundle-ManifestVersion: 2

59
hamcrest.spec
View File

@ -49,35 +49,42 @@
%endif
Name: hamcrest
Version: 1.1
Release: 22%{?dist}
Version: 1.3
Release: 1%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
URL: http://code.google.com/p/hamcrest/
Group: Development/Tools
Source0: http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
Source1: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
Source2: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.pom
Source3: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-integration/1.1/hamcrest-integration-1.1.pom
Source4: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-generator/1.1/hamcrest-generator-1.1.pom
Source5: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
Source6: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.pom
Source7: hamcrest-text-1.1.pom
Source0: http://%{name}.googlecode.com/files/%{name}-1.3.tgz
Source1: http://repo1.maven.org/maven2/org/%{name}/%{name}-parent/%{version}/%{name}-parent-%{version}.pom
Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-library/%{version}/%{name}-library-%{version}.pom
Source3: http://repo1.maven.org/maven2/org/%{name}/%{name}-integration/%{version}/%{name}-integration-%{version}.pom
Source4: http://repo1.maven.org/maven2/org/%{name}/%{name}-generator/%{version}/%{name}-generator-%{version}.pom
Source5: http://repo1.maven.org/maven2/org/%{name}/%{name}-core/%{version}/%{name}-core-%{version}.pom
Source6: http://repo1.maven.org/maven2/org/%{name}/%{name}-all/%{version}/%{name}-all-%{version}.pom
# This file was added by the maintainer for compatibility with maven dep
# solving system
Source7: %{name}-text-%{version}.pom
Source8: hamcrest-core-MANIFEST.MF
Source9: hamcrest-library-MANIFEST.MF
Source10: hamcrest-text-MANIFEST.MF
Source11: hamcrest-integration-MANIFEST.MF
Source12: hamcrest-generator-MANIFEST.MF
Patch0: hamcrest-1.1-build.patch
Patch1: hamcrest-1.1-no-jarjar.patch
Patch2: hamcrest-1.1-no-integration.patch
Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-%{version}-no-jarjar.patch
Patch2: %{name}-%{version}-no-integration.patch
Patch3: %{name}-%{version}-javadoc.patch
Requires: java >= 1:1.6.0
Requires: qdox
%if %with integration
Requires: easymock2
#Requires: jmock
%endif
Requires: qdox
BuildRequires: jpackage-utils >= 0:1.7.4
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
@ -141,26 +148,27 @@ ln -sf $(build-classpath easymock2) lib/integration/
%if %with integration
ln -sf $(build-classpath jmock) lib/integration/
%endif
# BUILD/hamcrest-1.1/lib/integration/junit-3.8.1.jar.no
ln -sf $(build-classpath junit) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
%endif
%patch0 -p0
%patch0 -p1
%if %without jarjar
%patch1 -p1
%endif
%if %without integration
#%patch2 -p1
%patch2 -p1
%endif
%patch3 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
%build
export CLASSPATH=$(build-classpath qdox)
export OPT_JAR_LIST="junit ant/ant-junit"
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=first clean core generator library text bigjar javadoc
# The unit-test goal is switched off as some tests fail with JDK 7
# see https://github.com/hamcrest/JavaHamcrest/issues/30
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests
mkdir -p META-INF
@ -231,7 +239,7 @@ install -m 644 build/%{name}-unit-test-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/temp/hamcrest-all-1.3-javadoc.jar.contents/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
@ -261,6 +269,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
* Thu Mar 21 2013 Tomas Radej <tradej@redhat.com> - 0:1.3-1
- Updated to latest upstream version
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@ -389,18 +400,18 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
* Thu Aug 10 2006 Karsten Hopp <karsten@redhat.de> 0:3.8.2-2jpp_3fc
- Require(post/postun): coreutils
* Sun Jun 23 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_2fc
* Fri Jun 23 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_2fc
- Rebuilt.
* Sat Jun 22 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_1fc
* Thu Jun 22 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_1fc
- Upgrade to 3.8.2
- Added conditional native compilation.
- Fix path where demo is located.
* Mon Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
* Fri Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
- First JPP-1.7 release
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
- Rebuild with ant-1.6.2
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
- update for JPackage 1.5

14
sources
View File

@ -1 +1,13 @@
1bd4fd301c1a0dc748082378a59cb281 hamcrest-1.1.tgz
29b18baac02244a9b7568d5bd5bb1c42 hamcrest-all-1.3.pom
7cd680c223f3807e1ef353466b9a4b25 hamcrest-core-1.3.pom
ba3c980bbf7d7b91d63d99da503aa3f4 hamcrest-generator-1.3.pom
442fa9ad7a4dfbd6a2ab5fca6e9b36c1 hamcrest-integration-1.3.pom
f09e58cd2a1ea76816c17141db41b2e1 hamcrest-library-1.3.pom
7591ddb3581de8684c17e51741a7461d hamcrest-parent-1.3.pom
de8c4213de11a0c2f83821bb700ac5eb hamcrest-text-1.3.pom
936fbdde78bd9896985405ce7e9fedb0 hamcrest-core-MANIFEST.MF
53744b9395f762bfbcdb9a6dcef84fc6 hamcrest-generator-MANIFEST.MF
9dd6758de43d07f08bbd3e242b9c01ee hamcrest-integration-MANIFEST.MF
b6d199eaa9b403df16a31e285d6d0cdc hamcrest-library-MANIFEST.MF
e11cedd6f8f6be75c373b9519475abb3 hamcrest-text-MANIFEST.MF
92e91c2754d44e49b72d70c10a04cb08 hamcrest-1.3.tgz