commit 3b80e905e0283668128bb6a9a623c33d93ae1bb1
Author: gil <puntogil(a)libero.it>
Date: Sat May 4 15:53:36 2013 +0200
update to 0.7-groovy-1.8
.gitignore | 1 +
sources | 2 +-
spock-0.7-groovy-1.8-build.xml | 192 ++++++++++++++++++++++++++++++++++++++++
spock-core-0.7-groovy-1.8.pom | 83 +++++++++++++++++
spock-guice-0.7-groovy-1.8.pom | 49 ++++++++++
spock.spec | 44 ++++++----
6 files changed, 352 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 064cc2b..c32a54b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/spock-0.6-groovy-1.8-src-git.tar.xz
+/spock-0.7-groovy-1.8.tar.gz
diff --git a/sources b/sources
index 3f7631c..2c82cd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-125781cd8022ddbecbaef88c994eeded spock-0.6-groovy-1.8-src-git.tar.xz
+d9d51d26fda96aa7c696175b55b3d007 spock-0.7-groovy-1.8.tar.gz
diff --git a/spock-0.7-groovy-1.8-build.xml b/spock-0.7-groovy-1.8-build.xml
new file mode 100644
index 0000000..b1433da
--- /dev/null
+++ b/spock-0.7-groovy-1.8-build.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- spock-0.6-groovy-1.8 build file by gil -->
+<project name="build-spock" default="dist"
basedir=".">
+
+ <property name="impl.version" value="0.7-groovy-1.8"/>
+
+ <property name="core.dir"
value="${basedir}/spock-core"/>
+ <property name="core.src.dir"
value="${core.dir}/src/main"/>
+ <property name="core.doc.src.dir"
value="${core.dir}/src/main/java"/>
+ <property name="core.resources.dir"
value="${core.dir}/src/main/resources"/>
+ <property name="core.build.dir"
value="${core.dir}/build/classes"/>
+
+ <property name="guice.dir"
value="${basedir}/spock-guice"/>
+ <property name="guice.src.dir"
value="${guice.dir}/src/main/java"/>
+ <property name="guice.build.dir"
value="${guice.dir}/build/classes"/>
+
+ <path id="groovyc.classpath">
+ <fileset dir="/usr/share/java"
includes="commons-cli.jar"/>
+ <fileset dir="/usr/share/java" includes="groovy.jar"/>
+ <fileset dir="/usr/share/java"
includes="objectweb-asm/asm-all.jar"/>
+ <fileset dir="/usr/share/java" includes="antlr.jar"/>
+ </path>
+
+ <path id="core.classpath">
+ <path refid="groovyc.classpath"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="/usr/share/java" includes="ant.jar"/>
+ <fileset dir="/usr/share/java" includes="cglib.jar"/>
+ <fileset dir="/usr/share/java"
includes="hamcrest12/core.jar"/>
+ <fileset dir="/usr/share/java"
includes="hamcrest12/library.jar"/>
+ <fileset dir="/usr/share/java" includes="junit.jar"/>
+ <fileset dir="/usr/share/java" includes="objenesis.jar"/>
+ </path>
+
+ <path id="guice.classpath">
+ <path refid="groovyc.classpath"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="${core.dir}/build/libs"
includes="spock-core-${impl.version}.jar"/>
+ <fileset dir="/usr/share/java"
includes="aopalliance.jar"/>
+ <fileset dir="/usr/share/java"
includes="guice/google-guice.jar"/>
+ </path>
+
+ <path id="javadoc.classpath">
+ <path refid="groovyc.classpath"/>
+ <fileset dir="${core.dir}/build/libs"
includes="spock-core-${impl.version}.jar"/>
+ <fileset dir="${guice.dir}/build/libs"
includes="spock-guice-${impl.version}.jar"/>
+ <fileset dir="/usr/share/java" includes="ant.jar"/>
+ <fileset dir="/usr/share/java"
includes="aopalliance.jar"/>
+ <fileset dir="/usr/share/java" includes="cglib.jar"/>
+ <fileset dir="/usr/share/java"
includes="guice/google-guice.jar"/>
+ <fileset dir="/usr/share/java"
includes="hamcrest12/core.jar"/>
+ <fileset dir="/usr/share/java"
includes="hamcrest12/library.jar"/>
+ <fileset dir="/usr/share/java" includes="junit.jar"/>
+ <fileset dir="/usr/share/java" includes="objenesis.jar"/>
+ </path>
+
+ <taskdef name="groovyc"
classname="org.codehaus.groovy.ant.Groovyc"
classpathref="groovyc.classpath"/>
+
+ <target name="clean">
+ <delete dir="${dir.build}"/>
+ </target>
+
+ <target name="init">
+ <mkdir dir="dist"/>
+ </target>
+
+ <target name="build"
+ depends="build.core,build.guice" description="Compile the
sources">
+ </target>
+
+ <target name="build.core" description="Build Spock Core">
+ <compile-groovy
+ buildclasspath="core.classpath"
+ dirsrc="${core.src.dir}"
+ destfile="${core.build.dir}"/>
+ <mkdir dir="${core.build.dir}/META-INF/services"/>
+ <copy todir="${core.build.dir}/META-INF/services"
overwrite="true">
+ <fileset dir="${core.resources.dir}/META-INF/services"
includes="**/org.*"/>
+ </copy>
+ <mkdir dir="${core.build.dir}/org/spockframework/idea"/>
+ <copy todir="${core.build.dir}/org/spockframework/idea"
overwrite="true">
+ <fileset dir="${core.resources.dir}/org/spockframework/idea"
includes="**/*.gdsl"/>
+ </copy>
+ <mkdir dir="${core.build.dir}/dsld"/>
+ <copy todir="${core.build.dir}/dsld" overwrite="true">
+ <fileset dir="${core.resources.dir}/dsld"
includes="**/*.dsld"/>
+ </copy>
+
+ <jar-and-manifest
+ basedir="${core.build.dir}"
+ destfile="core"
+ dest="${core.dir}/build/libs"
+ resources=""
+ cpath=""/>
+ </target>
+
+ <target name="build.guice" description="Build Spock Guice">
+ <compile-javac
+ buildclasspath="guice.classpath"
+ dirsrc="${guice.src.dir}"
+ destfile="${guice.build.dir}"/>
+
+ <jar-and-manifest
+ basedir="${guice.build.dir}"
+ destfile="guice"
+ dest="${guice.dir}/build/libs"
+ resources=""
+ cpath=""/>
+ </target>
+
+ <macrodef name="compile-groovy">
+ <attribute name="destfile"/>
+ <attribute name="dirsrc"/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default=""/>
+ <attribute name="buildclasspath" default=""/>
+ <sequential>
+ <mkdir dir="@{destfile}"/>
+ <groovyc
+ srcdir="@{dirsrc}"
+ destdir="@{destfile}"
+ classpathref="@{buildclasspath}"
+ sourcepath="">
+ <javac source="1.5" target="1.5"
debug="on"/>
+ </groovyc>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="compile-javac">
+ <attribute name="destfile"/>
+ <attribute name="dirsrc"/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default=""/>
+ <attribute name="buildclasspath" default=""/>
+ <sequential>
+ <mkdir dir="@{destfile}"/>
+ <javac
+ srcdir="@{dirsrc}"
+ destdir="@{destfile}"
+ classpathref="@{buildclasspath}"
+ source="1.5" target="1.5" debug="on">
+ </javac>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="jar-and-manifest">
+ <attribute name="destfile"/>
+ <attribute name="basedir"/>
+ <attribute name="dest"/>
+ <attribute name="cpath" default=""/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default="**/*"/>
+ <attribute name="resources" default=""/>
+ <attribute name="param" default=""/>
+ <attribute name="paramvalue" default=""/>
+ <sequential>
+ <jar destfile="@{dest}/spock-(a){destfile}-${impl.version}.jar"
+ basedir="@{basedir}"
+ excludes="@{excludes}"
+ includes="@{includes}">
+ </jar>
+ </sequential>
+ </macrodef>
+
+ <target name="dist" depends="init,build"
+ description="generate the distribution" >
+ </target>
+
+ <target name="javadoc">
+ <mkdir dir="dist/api"/>
+ <tstamp>
+ <format property="year" pattern="yyyy" />
+ </tstamp>
+ <javadoc
+ destdir="dist/api"
+ sourcepath="${core.doc.src.dir}:${guice.src.dir}"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ windowtitle="Spock Framework ${impl.version}">
+ <classpath refid="javadoc.classpath"/>
+ <doctitle><![CDATA[<h2>Spock Framework
${impl.version}</h2>]]></doctitle>
+ <bottom><![CDATA[<i>Copyright © ${year}. All rights
reserved</i>]]></bottom>
+ <group title="Spock Core"
packages="spock.config,spock.lang,spock.util.concurrent,spock.util.matcher,spock.util.mop,org.spockframework.builder,org.spockframework.buildsupport,org.spockframework.buildsupport.ant,org.spockframework.compiler,org.spockframework.compiler.model,org.spockframework.gentyref,org.spockframework.lang,org.spockframework.mock,org.spockframework.runtime,org.spockframework.runtime.condition,org.spockframework.runtime.extension,org.spockframework.runtime.extension.builtin,org.spockframework.runtime.model,org.spockframework.util,org.spockframework.util.inspector"/>
+ <group title="Spock Guice"
packages="spock.guice,org.spockframework.guice"/>
+ </javadoc>
+ </target>
+
+</project>
\ No newline at end of file
diff --git a/spock-core-0.7-groovy-1.8.pom b/spock-core-0.7-groovy-1.8.pom
new file mode 100644
index 0000000..af624dc
--- /dev/null
+++ b/spock-core-0.7-groovy-1.8.pom
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.spockframework</groupId>
+ <artifactId>spock-core</artifactId>
+ <version>0.7-groovy-1.8</version>
+ <name>Spock Framework - Core Module</name>
+ <description>Spock is a testing and specification framework for Java and Groovy
applications. What makes it stand out from the crowd is its beautiful and highly
expressive specification language. Thanks to its JUnit runner, Spock is compatible with
most IDEs, build tools, and continuous integration servers. Spock is inspired from JUnit,
jMock, RSpec, Groovy, Scala, Vulcans, and other fascinating life
forms.</description>
+ <url>http://spockframework.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>pniederw</id>
+ <name>Peter Niederwieser</name>
+ <email>pniederw(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>ldaley</id>
+ <name>Luke Daley</name>
+ <email>ld(a)ldaley.com</email>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:git://github.com/spockframework/spock.git</conne...
+
<developerConnection>scm:git:ssh://git@github.com/spockframework/spock.git</developerConnection>
+ <
url>http://github.spockframework.org/spock</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>4.10</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.8.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spock-guice-0.7-groovy-1.8.pom b/spock-guice-0.7-groovy-1.8.pom
new file mode 100644
index 0000000..9f596aa
--- /dev/null
+++ b/spock-guice-0.7-groovy-1.8.pom
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.spockframework</groupId>
+ <artifactId>spock-guice</artifactId>
+ <version>0.7-groovy-1.8</version>
+ <name>Spock Framework - Guice Module</name>
+ <description>Spock's Guice Module provides support for testing Guice 2/3
based applications.</description>
+ <url>http://spockframework.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>pniederw</id>
+ <name>Peter Niederwieser</name>
+ <email>pniederw(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>ldaley</id>
+ <name>Luke Daley</name>
+ <email>ld(a)ldaley.com</email>
+ </developer>
+ </developers>
+ <scm>
+
<
connection>scm:git:git://github.com/spockframework/spock.git</conne...
+
<developerConnection>scm:git:ssh://git@github.com/spockframework/spock.git</developerConnection>
+ <
url>http://github.spockframework.org/spock</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.spockframework</groupId>
+ <artifactId>spock-core</artifactId>
+ <version>0.7-groovy-1.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spock.spec b/spock.spec
index 26098f9..fc825ac 100644
--- a/spock.spec
+++ b/spock.spec
@@ -2,23 +2,20 @@
%global namedversion %{version}%{?namedreltag}
%global nameddottag %(echo %{?namedreltag} | tr - . )
Name: spock
-Version: 0.6
-Release: 0.5%{?nameddottag}%{?dist}
+Version: 0.7
+Release: 0.1%{?nameddottag}%{?dist}
Summary: A testing and specification framework
Group: Development/Libraries
License: ASL 2.0
URL:
http://code.google.com/p/spock/
# git clone
git://github.com/spockframework/spock.git spock-0.6-groovy-1.8
# cd spock-0.6-groovy-1.8/ && git archive --format=tar
--prefix=spock-0.6-groovy-1.8/ spock-0.6-groovy-1.8 | xz >
spock-0.6-groovy-1.8-src-git.tar.xz
-Source0: spock-%{namedversion}-src-git.tar.xz
-Source1:
http://repo1.maven.org/maven2/org/spockframework/spock-core/%{namedversio...
-Source2:
http://repo1.maven.org/maven2/org/spockframework/spock-guice/%{namedversi...
-Source3: spock-%{namedversion}-build.xml
-# fix deps aId
-Patch0: spock-%{namedversion}-core-pom.patch
+Source0:
https://github.com/spockframework/spock/archive/%{name}-%{namedversion}.t...
+Source1:
http://repo1.maven.org/maven2/org/spockframework/%{name}-core/%{namedvers...
+Source2:
http://repo1.maven.org/maven2/org/spockframework/%{name}-guice/%{namedver...
+Source3: %{name}-%{namedversion}-build.xml
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: antlr
@@ -33,7 +30,6 @@ BuildRequires: objectweb-asm
BuildRequires: objenesis
Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -61,23 +57,32 @@ Requires: google-guice
Requires: %{name}-core = %{version}-%{release}
%description guice
-Spock Framework - Guice Module.
+Spock Framework - Guice Module provides support for
+testing Guice 2/3 based applications.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
-%setup -q -n spock-%{namedversion}
+%setup -q -n %{name}-%{name}-%{namedversion}
find . -name "*.class" -delete
find . -name "*.jar" -delete
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
-%patch0 -p0
+cp -p %{SOURCE1} core-pom.xml
+%pom_add_dep org.hamcrest:hamcrest-library:1.3:compile core-pom.xml
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId
='junit']/pom:artifactId" core-pom.xml
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId
='junit']" \
+ "<artifactId>junit</artifactId>" core-pom.xml
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId
='org.codehaus.groovy']/pom:artifactId" core-pom.xml
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId
='org.codehaus.groovy']" \
+ "<artifactId>groovy</artifactId>" core-pom.xml
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId
='cglib']/pom:artifactId" core-pom.xml
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId
='cglib']" \
+ "<artifactId>cglib</artifactId>" core-pom.xml
+cp -p %{SOURCE2} guice-pom.xml
cp -p %{SOURCE3} build.xml
@@ -94,9 +99,9 @@ for m in core guice; do
done
mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 spock-core-%{namedversion}.pom
%{buildroot}%{_mavenpomdir}/JPP-%{name}-core.pom
+install -pm 644 core-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-core.pom
%add_maven_depmap -f core JPP-%{name}-core.pom %{name}-core.jar
-install -pm 644 spock-guice-%{namedversion}.pom
%{buildroot}%{_mavenpomdir}/JPP-%{name}-guice.pom
+install -pm 644 guice-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-guice.pom
%add_maven_depmap -f guice JPP-%{name}-guice.pom %{name}-guice.jar
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -119,6 +124,9 @@ cp -pr dist/api/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%changelog
+* Sat May 04 2013 gil cattaneo <puntogil(a)libero.it> 0.7-0.1.groovy.1.8
+- update to 0.7-groovy-1.8
+
* Tue Feb 19 2013 gil cattaneo <puntogil(a)libero.it> 0.6-0.5.groovy.1.8
- fixed google-guice in ant build script