Add a Spock module

weld · Jun 1, 2022 · 8d11b78 · 8d11b78
1 parent 55250b3
commit 8d11b78
Show file tree

Hide file tree

Showing 157 changed files with 8,582 additions and 5 deletions.
diff --git a/junit5/pom.xml b/junit5/pom.xml
@@ -52,10 +52,8 @@
       <dependency>
          <groupId>org.jboss.weld.module</groupId>
          <artifactId>weld-ejb</artifactId>
-         <version>${version.weld}</version>
-         <scope>test</scope>
       </dependency>
-      
+
    </dependencies>
 
 </project>
diff --git a/junit5/src/test/java/org/jboss/weld/junit5/auto/AutoConfigWithWeldSetupTest.java b/junit5/src/test/java/org/jboss/weld/junit5/auto/AutoConfigWithWeldSetupTest.java
@@ -21,7 +21,7 @@
  * exception was throws inside an extension. The test is fragile and can break because of internal JUnit 5 changes
  * in which case we might want to revisit if we want to keep it or whether there is a better way.
  *
- * @author bkautler
+ * @author Björn Kautler
  */
 @EnableAutoWeld
 class AutoConfigWithWeldSetupTest {
@@ -37,7 +37,7 @@ void test() {
   }
 
   /**
-   * @author bkautler
+   * @author Björn Kautler
    */
   static public class AssertExceptionExtension implements AfterEachCallback {
 

diff --git a/pom.xml b/pom.xml
@@ -42,10 +42,16 @@
       <!-- Versions -->
       <version.junit4>4.13.2</version.junit4>
       <version.junit.jupiter>5.8.2</version.junit.jupiter>
+      <version.spock>2.1-groovy-3.0</version.spock>
+      <version.junit.platform>1.8.2</version.junit.platform>
+      <version.groovy>3.0.10</version.groovy>
       <version.weld>5.0.0.CR2</version.weld>
       <version.mockito>4.4.0</version.mockito>
       <version.jakarta.ejb.api>4.0.0</version.jakarta.ejb.api>
+      <version.jakarta.inject>2.0.1</version.jakarta.inject>
+      <version.jakarta.cdi>4.0.0</version.jakarta.cdi>
       <version.jpa-api>3.1.0-RC2</version.jpa-api>
+      <version.log4j>2.17.2</version.log4j>
       <!-- SpotBugs properties -->
       <version.spotbugs>4.6.0</version.spotbugs>
       <version.spotbugs.plugin>4.6.0.0</version.spotbugs.plugin>
@@ -56,6 +62,7 @@
    <modules>
       <module>junit4</module>
       <module>junit5</module>
+      <module>spock</module>
       <module>junit-common</module>
    </modules>
 
@@ -87,6 +94,25 @@
             <version>${version.junit.jupiter}</version>
          </dependency>
 
+         <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${version.spock}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-testkit</artifactId>
+            <version>${version.junit.platform}</version>
+            <scope>test</scope>
+         </dependency>
+
+         <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${version.groovy}</version>
+         </dependency>
+
          <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -119,6 +145,20 @@
             <artifactId>spotbugs-annotations</artifactId>
             <version>${version.spotbugs}</version>
          </dependency>
+
+         <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${version.log4j}</version>
+            <scope>test</scope>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.weld.module</groupId>
+            <artifactId>weld-ejb</artifactId>
+            <version>${version.weld}</version>
+            <scope>test</scope>
+         </dependency>
       </dependencies>
 
    </dependencyManagement>
@@ -144,6 +184,7 @@
                            <xmlOutput>true</xmlOutput>
                            <threshold>${spotbugs.threshold}</threshold>
                            <failOnError>${spotbugs.failOnError}</failOnError>
+                           <excludeFilterFile>${spotbugs.excludeFilterFile}</excludeFilterFile>
                        </configuration>
                        <executions>
                            <execution>
@@ -172,6 +213,32 @@
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>1.13.1</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>addTestSources</goal>
+                                <goal>compileTests</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <links>
+                            <link>https://static.javadoc.io/org.jboss.weld.se/weld-se-core/${version.weld}/</link>
+                            <link>https://static.javadoc.io/jakarta.inject/jakarta.inject-api/${version.jakarta.inject}/</link>
+                            <link>https://static.javadoc.io/jakarta.enterprise/jakarta.enterprise.cdi-api/${version.jakarta.cdi}/</link>
+                            <link>https://static.javadoc.io/org.jboss.weld.environment/weld-environment-common/${version.weld}/</link>
+                            <link>https://static.javadoc.io/org.spockframework/spock-core/${version.spock}/</link>
+                        </links>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/spock/.gitignore b/spock/.gitignore
@@ -0,0 +1,6 @@
+/target/
+/.settings/
+/.classpath
+/.project
+/.idea
+*.iml