Skip to content

Commit fc30c0e

Browse files
kubamarchwickikubamarchwicki
committed
Moving groovy / Spock dependencies to an extra/spock-tests/pom.xml
1 parent 9802287 commit fc30c0e

File tree

2 files changed

+94
-102
lines changed

2 files changed

+94
-102
lines changed

‎extra/spock-tests/pom.xml

+94
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@
1111

1212
<artifactId>spock-tests</artifactId>
1313

14+
<properties>
15+
<org.jboss.arquillian.spock>1.0.0.Beta2</org.jboss.arquillian.spock>
16+
<spock.version>0.7-groovy-2.0</spock.version>
17+
<groovy.version>2.3.0</groovy.version>
18+
</properties>
19+
1420
<dependencies>
21+
<!-- projects -->
1522
<dependency>
1623
<groupId>org.javaee7</groupId>
1724
<artifactId>jpa-listeners-injection</artifactId>
@@ -33,6 +40,93 @@
3340
<classifier>classes</classifier>
3441
<scope>test</scope>
3542
</dependency>
43+
44+
<!-- test libs -->
45+
<dependency>
46+
<groupId>org.jboss.arquillian.spock</groupId>
47+
<artifactId>arquillian-spock-container</artifactId>
48+
<version>${org.jboss.arquillian.spock}</version>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.spockframework</groupId>
53+
<artifactId>spock-core</artifactId>
54+
<version>${spock.version}</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.codehaus.groovy</groupId>
59+
<artifactId>groovy-all</artifactId>
60+
<version>${groovy.version}</version>
61+
<scope>test</scope>
62+
</dependency>
3663
</dependencies>
3764

65+
<build>
66+
<plugins>
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-compiler-plugin</artifactId>
70+
<version>3.1</version>
71+
<configuration>
72+
<source>${java.min.version}</source>
73+
<target>${java.min.version}</target>
74+
<compilerId>groovy-eclipse-compiler</compilerId>
75+
</configuration>
76+
<dependencies>
77+
<dependency>
78+
<groupId>org.codehaus.groovy</groupId>
79+
<artifactId>groovy-eclipse-compiler</artifactId>
80+
<version>2.8.0-01</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.codehaus.groovy</groupId>
84+
<artifactId>groovy-eclipse-batch</artifactId>
85+
<version>2.1.5-03</version>
86+
</dependency>
87+
</dependencies>
88+
</plugin>
89+
<plugin>
90+
<groupId>org.codehaus.groovy</groupId>
91+
<artifactId>groovy-eclipse-compiler</artifactId>
92+
<version>2.8.0-01</version>
93+
<extensions>true</extensions>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-surefire-plugin</artifactId>
98+
<version>2.17</version>
99+
<executions>
100+
<execution>
101+
<id>default-test</id>
102+
<phase>test</phase>
103+
<goals>
104+
<goal>test</goal>
105+
</goals>
106+
<configuration>
107+
<classpathDependencyExcludes>
108+
<classpathDependencyExcludes>org.jboss.arquillian.spock:arquillian-spock-container</classpathDependencyExcludes>
109+
</classpathDependencyExcludes>
110+
</configuration>
111+
</execution>
112+
<execution>
113+
<id>spock-test</id>
114+
<phase>test</phase>
115+
<goals>
116+
<goal>test</goal>
117+
</goals>
118+
<configuration>
119+
<includes>
120+
<include>**/*Specification.java</include>
121+
</includes>
122+
<classpathDependencyExcludes>
123+
<classpathDependencyExcludes>org.jboss.arquillian.junit:arquillian-junit-container</classpathDependencyExcludes>
124+
</classpathDependencyExcludes>
125+
</configuration>
126+
</execution>
127+
</executions>
128+
</plugin>
129+
</plugins>
130+
</build>
131+
38132
</project>

‎pom.xml

-102
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,6 @@
2525
<packaging>pom</packaging>
2626
<name>Java EE 7 Sample: javaee7-samples</name>
2727

28-
<repositories>
29-
<repository>
30-
<id>codehaus-snapshots</id>
31-
<name>Codehaus Snapshots</name>
32-
<url>http://nexus.codehaus.org/snapshots/</url>
33-
<releases>
34-
<enabled>false</enabled>
35-
</releases>
36-
<snapshots>
37-
<enabled>true</enabled>
38-
</snapshots>
39-
</repository>
40-
</repositories>
41-
42-
<pluginRepositories>
43-
<pluginRepository>
44-
<id>codehaus-snapshots</id>
45-
<name>Codehaus Snapshots</name>
46-
<url>http://nexus.codehaus.org/snapshots/</url>
47-
<releases>
48-
<enabled>false</enabled>
49-
</releases>
50-
<snapshots>
51-
<enabled>true</enabled>
52-
</snapshots>
53-
</pluginRepository>
54-
</pluginRepositories>
55-
5628
<properties>
5729
<java.min.version>1.7</java.min.version>
5830
<maven.min.version>3.0.0</maven.min.version>
@@ -61,15 +33,12 @@
6133
<org.jboss.arquillian.drone.version>1.3.0.Final</org.jboss.arquillian.drone.version>
6234
<org.jboss.arquillian.selenium.bom.version>2.40.0</org.jboss.arquillian.selenium.bom.version>
6335
<org.jboss.arquillian.graphene.version>2.0.2.Final</org.jboss.arquillian.graphene.version>
64-
<org.jboss.arquillian.spock>1.0.0.Beta2</org.jboss.arquillian.spock>
6536
<org.wildfly>8.2.0.Final</org.wildfly>
6637
<org.jboss.eap>7.2.0.Final</org.jboss.eap>
6738
<!-- Plugin versions -->
6839
<plugin.enforcer.version>1.3.1</plugin.enforcer.version>
6940
<maven.test.skip>false</maven.test.skip>
7041
<hamcrest.version>1.3</hamcrest.version>
71-
<spock.version>0.7-groovy-2.0</spock.version>
72-
<groovy.version>2.3.0</groovy.version>
7342
<glassfish.version>4.0</glassfish.version>
7443
</properties>
7544

@@ -184,12 +153,6 @@
184153
<artifactId>arquillian-junit-container</artifactId>
185154
<scope>test</scope>
186155
</dependency>
187-
<dependency>
188-
<groupId>org.jboss.arquillian.spock</groupId>
189-
<artifactId>arquillian-spock-container</artifactId>
190-
<version>${org.jboss.arquillian.spock}</version>
191-
<scope>test</scope>
192-
</dependency>
193156
<dependency>
194157
<groupId>org.jboss.arquillian.protocol</groupId>
195158
<artifactId>arquillian-protocol-servlet</artifactId>
@@ -206,18 +169,6 @@
206169
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
207170
<scope>test</scope>
208171
</dependency>
209-
<dependency>
210-
<groupId>org.spockframework</groupId>
211-
<artifactId>spock-core</artifactId>
212-
<version>${spock.version}</version>
213-
<scope>test</scope>
214-
</dependency>
215-
<dependency>
216-
<groupId>org.codehaus.groovy</groupId>
217-
<artifactId>groovy-all</artifactId>
218-
<version>${groovy.version}</version>
219-
<scope>test</scope>
220-
</dependency>
221172
<dependency>
222173
<groupId>xmlunit</groupId>
223174
<artifactId>xmlunit</artifactId>
@@ -278,60 +229,7 @@
278229
<configuration>
279230
<source>${java.min.version}</source>
280231
<target>${java.min.version}</target>
281-
<compilerId>groovy-eclipse-compiler</compilerId>
282232
</configuration>
283-
<dependencies>
284-
<dependency>
285-
<groupId>org.codehaus.groovy</groupId>
286-
<artifactId>groovy-eclipse-compiler</artifactId>
287-
<version>2.8.0-01</version>
288-
</dependency>
289-
<dependency>
290-
<groupId>org.codehaus.groovy</groupId>
291-
<artifactId>groovy-eclipse-batch</artifactId>
292-
<version>2.1.5-03</version>
293-
</dependency>
294-
</dependencies>
295-
</plugin>
296-
<plugin>
297-
<groupId>org.codehaus.groovy</groupId>
298-
<artifactId>groovy-eclipse-compiler</artifactId>
299-
<version>2.8.0-01</version>
300-
<extensions>true</extensions>
301-
</plugin>
302-
<plugin>
303-
<groupId>org.apache.maven.plugins</groupId>
304-
<artifactId>maven-surefire-plugin</artifactId>
305-
<version>2.17</version>
306-
<executions>
307-
<execution>
308-
<id>default-test</id>
309-
<phase>test</phase>
310-
<goals>
311-
<goal>test</goal>
312-
</goals>
313-
<configuration>
314-
<classpathDependencyExcludes>
315-
<classpathDependencyExcludes>org.jboss.arquillian.spock:arquillian-spock-container</classpathDependencyExcludes>
316-
</classpathDependencyExcludes>
317-
</configuration>
318-
</execution>
319-
<execution>
320-
<id>spock-test</id>
321-
<phase>test</phase>
322-
<goals>
323-
<goal>test</goal>
324-
</goals>
325-
<configuration>
326-
<includes>
327-
<include>**/*Specification.java</include>
328-
</includes>
329-
<classpathDependencyExcludes>
330-
<classpathDependencyExcludes>org.jboss.arquillian.junit:arquillian-junit-container</classpathDependencyExcludes>
331-
</classpathDependencyExcludes>
332-
</configuration>
333-
</execution>
334-
</executions>
335233
</plugin>
336234
<plugin>
337235
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)