specific scope test

stornado · Jun 25, 2021 · 580e403 · 580e403
1 parent 123e2ba
commit 580e403
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 31 deletions.
diff --git a/archetype-catalog.xml b/archetype-catalog.xml
@@ -6,13 +6,13 @@
     <archetype>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest-archetype</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
       <description>基于 (Ju)ni5 + All(ure) + (Rest) Assured 实现接口测试</description>
     </archetype>
     <archetype>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest-modules-archetype</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
       <description>基于 (Ju)ni5 + All(ure) + (Rest) Assured 实现接口测试</description>
     </archetype>
   </archetypes>

diff --git a/jurest-archetype/pom.xml b/jurest-archetype/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest-archetype</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>maven-archetype</packaging>
 
   <build>

diff --git a/jurest-archetype/src/main/resources/archetype-resources/pom.xml b/jurest-archetype/src/main/resources/archetype-resources/pom.xml
@@ -13,7 +13,8 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -47,7 +48,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <type>pom</type>
       </dependency>
 
@@ -63,7 +64,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${java.version}</maven.compiler.compilerVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <aspectj.version>1.9.5</aspectj.version>
+    <aspectj.version>1.9.6</aspectj.version>
     <allure.version>2.13.8</allure.version>
     <pmd.version>6.32.0</pmd.version>
   </properties>
@@ -84,7 +85,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>11</version>
+                  <version>${java.version}</version>
                 </requireJavaVersion>
                 <banDuplicatePomDependencyVersions/>
               </rules>
@@ -95,12 +96,14 @@
 
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.22.2</version>
         <configuration>
           <argLine>
             -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
           </argLine>
+          <testFailureIgnore>true</testFailureIgnore>
         </configuration>
         <dependencies>
           <!-- https://mvnrepository.com/artifact/org.aspectj/aspectjweaver -->
@@ -110,6 +113,11 @@
             <version>${aspectj.version}</version>
           </dependency>
 
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0</version>
+          </dependency>
           <!-- https://mvnrepository.com/artifact/org.apache.maven.surefire/surefire-junit-platform -->
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
@@ -136,6 +144,7 @@
 
       <!-- https://maven.apache.org/plugins/maven-pmd-plugin/index.html -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
         <version>3.14.0</version>
         <executions>
@@ -196,13 +205,14 @@
     <plugins>
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-pmd-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
         <configuration>
           <sourceEncoding>utf-8</sourceEncoding>
           <includeTests>true</includeTests>
           <includeXmlInSite>true</includeXmlInSite>
           <aggregate>true</aggregate>
-          <targetJdk>11</targetJdk>
+          <targetJdk>${java.version}</targetJdk>
           <skipEmptyReport>true</skipEmptyReport>
           <minimumPriority>1</minimumPriority>
           <rulesets>

diff --git a/...etype/src/main/resources/archetype-resources/src/test/resources/junit-platform.properties b/...etype/src/main/resources/archetype-resources/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled=true
+junit.jupiter.execution.parallel.mode.default=concurrent
+junit.jupiter.execution.parallel.mode.classes.default = same_thread
diff --git a/jurest-bom/pom.xml b/jurest-bom/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest-bom</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>pom</packaging>
 
   <dependencyManagement>

diff --git a/jurest-modules-archetype/pom.xml b/jurest-modules-archetype/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest-modules-archetype</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>maven-archetype</packaging>
 
   <build>

diff --git a/jurest-modules-archetype/src/main/resources/archetype-resources/pom.xml b/jurest-modules-archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,8 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -49,7 +50,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <type>pom</type>
       </dependency>
 
@@ -65,7 +66,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${java.version}</maven.compiler.compilerVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <aspectj.version>1.9.5</aspectj.version>
+    <aspectj.version>1.9.6</aspectj.version>
     <allure.version>2.13.8</allure.version>
     <pmd.version>6.32.0</pmd.version>
   </properties>
@@ -86,7 +87,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>11</version>
+                  <version>${java.version}</version>
                 </requireJavaVersion>
                 <banDuplicatePomDependencyVersions/>
               </rules>
@@ -97,24 +98,27 @@
 
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <encoding>UTF-8</encoding>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
         </configuration>
       </plugin>
 
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.22.2</version>
         <configuration>
           <argLine>
             -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
           </argLine>
+          <testFailureIgnore>true</testFailureIgnore>
         </configuration>
         <dependencies>
           <!-- https://mvnrepository.com/artifact/org.aspectj/aspectjweaver -->
@@ -124,6 +128,11 @@
             <version>${aspectj.version}</version>
           </dependency>
 
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.0</version>
+          </dependency>
           <!-- https://mvnrepository.com/artifact/org.apache.maven.surefire/surefire-junit-platform -->
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
@@ -150,6 +159,7 @@
 
       <!-- https://maven.apache.org/plugins/maven-pmd-plugin/index.html -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
         <version>3.14.0</version>
         <executions>
@@ -193,6 +203,7 @@
       <!-- https://maven.apache.org/plugins/maven-site-plugin/ -->
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-site-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <version>3.9.1</version>
         <configuration>
@@ -211,13 +222,14 @@
     <plugins>
       <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-pmd-plugin -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
         <configuration>
           <sourceEncoding>utf-8</sourceEncoding>
           <includeTests>true</includeTests>
           <includeXmlInSite>true</includeXmlInSite>
           <aggregate>true</aggregate>
-          <targetJdk>11</targetJdk>
+          <targetJdk>${java.version}</targetJdk>
           <skipEmptyReport>true</skipEmptyReport>
           <minimumPriority>1</minimumPriority>
           <rulesets>

diff --git a/jurest-pmd/pom.xml b/jurest-pmd/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest-pmd</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -32,7 +32,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/jurest-util/pom.xml b/jurest-util/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest-util</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
 
   <dependencies>
     <dependency>
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/jurest/pom.xml b/jurest/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.zxytech.jurest</groupId>
     <artifactId>jurest-parent</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>jurest</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>jar</packaging>
 
   <name>JuRest</name>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest-util</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
@@ -287,7 +287,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.zxytech.jurest</groupId>
   <artifactId>jurest-parent</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>pom</packaging>
 
   <name>JuRest API Test</name>