Update Dependencies

main
Leonard Brünings 8 years ago
parent 3f5f52a68e
commit 3d454b9334

3
.gitignore vendored

@ -20,4 +20,5 @@ bin/
*.iws *.iws
*.ipr *.ipr
*.iml *.iml
out/ .idea/
out/

@ -3,8 +3,8 @@ apply plugin: "groovy"
version = "1.0" version = "1.0"
description = "Spock Framework - Example Project" description = "Spock Framework - Example Project"
// Spock works with Java 1.5 and above // Spock works with Java 1.6 and above
sourceCompatibility = 1.5 sourceCompatibility = 1.6
repositories { repositories {
// Spock releases are available from Maven Central // Spock releases are available from Maven Central
@ -16,12 +16,12 @@ repositories {
dependencies { dependencies {
// mandatory dependencies for using Spock // mandatory dependencies for using Spock
compile "org.codehaus.groovy:groovy-all:2.4.1" compile "org.codehaus.groovy:groovy-all:2.4.1"
testCompile "org.spockframework:spock-core:1.0-groovy-2.4" testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
// optional dependencies for using Spock // optional dependencies for using Spock
testCompile "org.hamcrest:hamcrest-core:1.3" // only necessary if Hamcrest matchers are used testCompile "org.hamcrest:hamcrest-core:1.3" // only necessary if Hamcrest matchers are used
testRuntime "cglib:cglib-nodep:3.1" // allows mocking of classes (in addition to interfaces) testRuntime "cglib:cglib-nodep:3.2.4" // allows mocking of classes (in addition to interfaces)
testRuntime "org.objenesis:objenesis:2.1" // allows mocking of classes without default constructor (together with CGLIB) testRuntime "org.objenesis:objenesis:2.5.1" // allows mocking of classes without default constructor (together with CGLIB)
// dependencies used by examples in this project // dependencies used by examples in this project
testRuntime "com.h2database:h2:1.4.182" testRuntime "com.h2database:h2:1.4.182"

@ -2,12 +2,12 @@
<property name="src.dir" location="src/test/groovy" /> <property name="src.dir" location="src/test/groovy" />
<property name="resource.dir" location="src/test/resources" /> <property name="resource.dir" location="src/test/resources" />
<property name="build.dir" location="ant/build" /> <property name="build.dir" location="ant/build" />
<property name="lib.dir" location="ant/lib" /> <property name="lib.dir" location="ant/lib" />
<property name="maven.ant.tasks.url" value="http://central.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar" /> <property name="maven.ant.tasks.url" value="http://central.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar" />
<property name="maven.ant.tasks.jar" value="${lib.dir}${file.separator}maven-ant-tasks-2.1.3.jar" /> <property name="maven.ant.tasks.jar" value="${lib.dir}${file.separator}maven-ant-tasks-2.1.3.jar" />
<available property="maven.ant.tasks.jar.exists" file="${maven.ant.tasks.jar}" /> <available property="maven.ant.tasks.jar.exists" file="${maven.ant.tasks.jar}" />
<target name="bootstrap.maven.tasks" unless="maven.ant.tasks.jar.exists"> <target name="bootstrap.maven.tasks" unless="maven.ant.tasks.jar.exists">
<mkdir dir="${lib.dir}" /> <mkdir dir="${lib.dir}" />
<get <get
@ -16,30 +16,30 @@
</target> </target>
<target name="init.maven.tasks" depends="bootstrap.maven.tasks"> <target name="init.maven.tasks" depends="bootstrap.maven.tasks">
<typedef <typedef
resource="org/apache/maven/artifact/ant/antlib.xml" resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant" uri="urn:maven-artifact-ant"
classpath="${maven.ant.tasks.jar}" /> classpath="${maven.ant.tasks.jar}" />
</target> </target>
<target name="resolve.dependencies" depends="init.maven.tasks"> <target name="resolve.dependencies" depends="init.maven.tasks">
<artifact:dependencies pathId="classpath.spock"> <artifact:dependencies pathId="classpath.spock">
<!-- Mandatory dependencies for using Spock --> <!-- Mandatory dependencies for using Spock -->
<dependency <dependency
groupId="org.spockframework" groupId="org.spockframework"
artifactId="spock-core" artifactId="spock-core"
version="1.0-groovy-2.4" /> version="1.1-groovy-2.4-rc-3" />
<!-- Optional dependencies for using Spock --> <!-- Optional dependencies for using Spock -->
<!-- enables mocking of classes (in addition to interfaces) --> <!-- enables mocking of classes (in addition to interfaces) -->
<dependency <dependency
groupId="cglib" groupId="cglib"
artifactId="cglib-nodep" artifactId="cglib-nodep"
version="3.1" /> version="3.2.4" />
<!-- enables mocking of classes without parameterless constructor (together with CGLIB) --> <!-- enables mocking of classes without parameterless constructor (together with CGLIB) -->
<dependency <dependency
groupId="org.objenesis" groupId="org.objenesis"
artifactId="objenesis" artifactId="objenesis"
version="2.1" /> version="2.5.1" />
<!-- only required if Spock's Ant selector is used, which finds spec classes regardless of their name --> <!-- only required if Spock's Ant selector is used, which finds spec classes regardless of their name -->
<dependency <dependency
groupId="org.ow2.asm" groupId="org.ow2.asm"
@ -64,19 +64,19 @@
url="https://oss.sonatype.org/content/repositories/snapshots/" /> url="https://oss.sonatype.org/content/repositories/snapshots/" />
</artifact:dependencies> </artifact:dependencies>
</target> </target>
<target name="init.groovy.tasks" depends="resolve.dependencies"> <target name="init.groovy.tasks" depends="resolve.dependencies">
<!-- Using the Groovy compiler from classpath.spock is a simple and safe setup --> <!-- Using the Groovy compiler from classpath.spock is a simple and safe setup -->
<taskdef <taskdef
name="groovyc" name="groovyc"
classname="org.codehaus.groovy.ant.Groovyc" classname="org.codehaus.groovy.ant.Groovyc"
classpathref="classpath.spock" /> classpathref="classpath.spock" />
</target> </target>
<target name="init" depends="init.groovy.tasks"> <target name="init" depends="init.groovy.tasks">
<tstamp /> <tstamp />
<mkdir dir="${build.dir}" /> <mkdir dir="${build.dir}" />
</target> </target>
<target name="copy.resources" depends="init"> <target name="copy.resources" depends="init">
<copy todir="${build.dir}"> <copy todir="${build.dir}">
@ -90,11 +90,11 @@
destdir="${build.dir}" destdir="${build.dir}"
classpathref="classpath.spock" /> classpathref="classpath.spock" />
</target> </target>
<target name="test" depends="compile"> <target name="test" depends="compile">
<junit fork="true" forkmode="once"> <junit fork="true" forkmode="once">
<classpath path="${build.dir}" /> <classpath path="${build.dir}" />
<classpath refid="classpath.spock" /> <classpath refid="classpath.spock" />
<batchtest> <batchtest>
<fileset dir="${build.dir}"> <fileset dir="${build.dir}">
<custom <custom
@ -109,4 +109,4 @@
<target name="clean"> <target name="clean">
<delete dir="${build.dir}" /> <delete dir="${build.dir}" />
</target> </target>
</project> </project>

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

@ -21,7 +21,7 @@
visit https://github.com/groovy/GMavenPlus/wiki --> visit https://github.com/groovy/GMavenPlus/wiki -->
<groupId>org.codehaus.gmavenplus</groupId> <groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId> <artifactId>gmavenplus-plugin</artifactId>
<version>1.4</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -35,7 +35,7 @@
<!-- Only required if names of spec classes don't match default Surefire patterns (`*Test` etc.) --> <!-- Only required if names of spec classes don't match default Surefire patterns (`*Test` etc.) -->
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version> <version>2.18.1</version>
<configuration> <configuration>
<useFile>false</useFile> <useFile>false</useFile>
<includes> <includes>
@ -46,7 +46,7 @@
<!-- Only required for spock-example build --> <!-- Only required for spock-example build -->
<plugin> <plugin>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version> <version>2.8.2</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
@ -59,25 +59,25 @@
<dependency> <dependency>
<groupId>org.spockframework</groupId> <groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId> <artifactId>spock-core</artifactId>
<version>1.0-groovy-2.4</version> <version>1.1-groovy-2.4-rc-3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Optional dependencies for using Spock --> <!-- Optional dependencies for using Spock -->
<dependency> <!-- use a specific Groovy version rather than the one specified by spock-core --> <dependency> <!-- use a specific Groovy version rather than the one specified by spock-core -->
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>2.4.1</version> <version>2.4.7</version>
</dependency> </dependency>
<dependency> <!-- enables mocking of classes (in addition to interfaces) --> <dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>3.1</version> <version>3.2.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <!-- enables mocking of classes without default constructor (together with CGLIB) --> <dependency> <!-- enables mocking of classes without default constructor (together with CGLIB) -->
<groupId>org.objenesis</groupId> <groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId> <artifactId>objenesis</artifactId>
<version>2.1</version> <version>2.5.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <!-- only required if Hamcrest matchers are used --> <dependency> <!-- only required if Hamcrest matchers are used -->

Loading…
Cancel
Save