remove codegen

stornado · Apr 10, 2021 · 123e2ba · 123e2ba
1 parent 987051d
commit 123e2ba
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 86 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.1</version>
+      <version>1.1.2</version>
       <description>基于 (Ju)ni5 + All(ure) + (Rest) Assured 实现接口测试</description>
     </archetype>
     <archetype>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest-modules-archetype</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2</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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest-archetype</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>maven-archetype</packaging>
 
   <build>

diff --git a/jurest-archetype/src/main/resources/archetype-resources/HELP.md b/jurest-archetype/src/main/resources/archetype-resources/HELP.md
@@ -24,7 +24,7 @@ In order to view the report run
 ./mvnw -s settings.xml allure:serve
 ```
 
-Visit report http://localhost:9000/
+Visit report http://localhost:9000/project-reports.html
 
 buid site
 

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,7 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -47,7 +47,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <type>pom</type>
       </dependency>
 
@@ -187,37 +187,6 @@
           <!-- <tempWebappDirectory>${basedir}/target/site/tempdir</tempWebappDirectory> -->
         </configuration>
       </plugin>
-
-      <!-- https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin -->
-      <plugin>
-        <groupId>io.swagger.codegen.v3</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>3.0.25</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <!--Your input swagger spec-->
-              <inputSpec>${project.directory}/swagger.json</inputSpec>
-              <output>${project.build.directory}/generated-sources/swagger</output>
-              <language>java</language>
-              <configOptions>
-                <dateLibrary>java8</dateLibrary>
-              </configOptions>
-              <library>rest-assured</library>
-              <!--Generate 'templates' for tests-->
-              <generateApiTests>true</generateApiTests>
-              <generateApiDocumentation>false</generateApiDocumentation>
-              <generateModelDocumentation>false</generateModelDocumentation>
-              <apiPackage>${default.package}.api</apiPackage>
-              <modelPackage>${default.package}.model</modelPackage>
-              <invokerPackage>${default.package}.handler</invokerPackage>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest-bom</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest-modules-archetype</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>maven-archetype</packaging>
 
   <build>

diff --git a/jurest-modules-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/jurest-modules-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -24,6 +24,8 @@ name="Multi Modules Archetype for JuRest API test framework"
         <include>HELP.md</include>
         <include>mvnw</include>
         <include>mvnw.cmd</include>
+        <include>allure.properties</include>
+        <include>log4j.properties</include>
       </includes>
     </fileSet>
     <fileSet encoding="UTF-8" filtered="true" packaged="false">

diff --git a/jurest-modules-archetype/src/main/resources/archetype-resources/HELP.md b/jurest-modules-archetype/src/main/resources/archetype-resources/HELP.md
@@ -24,7 +24,7 @@ In order to view the report run
 ./mvnw -s settings.xml allure:serve
 ```
 
-Visit report http://localhost:9000/
+Visit report http://localhost:9000/project-reports.html
 
 buid site
 

diff --git a/jurest-modules-archetype/src/main/resources/archetype-resources/allure.properties b/jurest-modules-archetype/src/main/resources/archetype-resources/allure.properties
@@ -0,0 +1,2 @@
+#allure属性配置
+allure.results.directory=target/allure-results
diff --git a/jurest-modules-archetype/src/main/resources/archetype-resources/log4j.properties b/jurest-modules-archetype/src/main/resources/archetype-resources/log4j.properties
@@ -0,0 +1,24 @@
+#
+# Copyright 2019 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Set root category priority to INFO and its only appender to CONSOLE.
+log4j.rootCategory=INFO, CONSOLE
+log4j.logger.groovyx.net.http.ParserRegistry=ERROR
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} [%t] %5p %c{1}.%M:%L - %m%n
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,7 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -49,7 +49,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <type>pom</type>
       </dependency>
 
@@ -202,36 +202,6 @@
         </configuration>
       </plugin>
 
-      <!-- https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin -->
-      <plugin>
-        <groupId>io.swagger.codegen.v3</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>3.0.25</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <!--Your input swagger spec-->
-              <inputSpec>${project.directory}/swagger.json</inputSpec>
-              <output>${project.build.directory}/generated-sources/swagger</output>
-              <language>java</language>
-              <configOptions>
-                <dateLibrary>java8</dateLibrary>
-              </configOptions>
-              <library>rest-assured</library>
-              <!--Generate 'templates' for tests-->
-              <generateApiTests>true</generateApiTests>
-              <generateApiDocumentation>false</generateApiDocumentation>
-              <generateModelDocumentation>false</generateModelDocumentation>
-              <apiPackage>${default.package}.api</apiPackage>
-              <modelPackage>${default.package}.model</modelPackage>
-              <invokerPackage>${default.package}.handler</invokerPackage>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest-pmd</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -32,7 +32,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest-util</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
 
   <dependencies>
     <dependency>
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.zxytech.jurest</groupId>
         <artifactId>jurest-bom</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</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.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>jurest</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>jar</packaging>
 
   <name>JuRest</name>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>com.zxytech.jurest</groupId>
       <artifactId>jurest-util</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2</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.1</version>
+        <version>1.1.2</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.1</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
 
   <name>JuRest API Test</name>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#allure属性配置
		allure.results.directory=target/allure-results