ci

sp42 · Dec 10, 2023 · 0646e41 · 0646e41
1 parent 5781e2b
commit 0646e41
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 43 deletions.
diff --git a/aj-backend/aj-framework/aj-common-parent/pom.xml b/aj-backend/aj-framework/aj-common-parent/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath />
     </parent>
     <artifactId>aj-common-parent</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <packaging>pom</packaging>
     <description>常见项目的依赖</description>
 
@@ -100,6 +100,7 @@
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
                             <!-- 这里是项目主类运行入口 -->
+                            <!--suppress UnresolvedMavenProperty -->
                             <mainClass>${project.mainClass}</mainClass>
                         </manifest>
                     </archive>
@@ -119,7 +120,7 @@
         <dependency>
             <groupId>com.ajaxjs</groupId>
             <artifactId>ajaxjs-framework</artifactId>
-            <version>1.1.6</version>
+            <version>1.1.7</version>
         </dependency>
 
         <dependency>

diff --git a/aj-backend/aj-framework/aj-framework/pom.xml b/aj-backend/aj-framework/aj-framework/pom.xml
@@ -3,15 +3,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ajaxjs-framework</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
     <name>aj-framework</name>
     <description>轻量级的开发框架</description>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath/>
     </parent>
 
@@ -38,13 +38,7 @@
         <dependency>
             <groupId>com.ajaxjs</groupId>
             <artifactId>aj-json</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>1.3</version>
         </dependency>
 
         <dependency>
@@ -57,7 +51,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <!-- <version>5.3.6</version> -->
             <version>${spring.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/aj-backend/aj-framework/aj-json/pom.xml b/aj-backend/aj-framework/aj-json/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath/>
     </parent>
     <artifactId>aj-json</artifactId>
-    <version>1.2</version>
-    <description>JSON 反序列化</description>
+    <version>1.3</version>
+    <description>轻量级的 JSON 反序列化</description>
     <packaging>jar</packaging>
 </project>
diff --git a/aj-backend/aj-framework/aj-web/pom.xml b/aj-backend/aj-framework/aj-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>ajaxjs-web</artifactId>
@@ -35,12 +35,11 @@
         </plugins>
     </build>
 
-
     <dependencies>
         <dependency>
             <groupId>com.ajaxjs</groupId>
             <artifactId>ajaxjs-framework</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.7</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/aj-backend/aj-iam/aj-iam-client/pom.xml b/aj-backend/aj-iam/aj-iam-client/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath/>
     </parent>
     <artifactId>aj-iam-client</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <description>user</description>
     <packaging>jar</packaging>
 

diff --git a/aj-backend/aj-iam/aj-iam-resource-server/pom.xml b/aj-backend/aj-iam/aj-iam-resource-server/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>ajaxjs-parent</artifactId>
-        <version>1.16</version>
+        <version>1.17</version>
         <relativePath/>
     </parent>
     <artifactId>aj-iam-resource-server</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <description>资源服务器 Resource Server 的 SDK</description>
     <packaging>jar</packaging>
 

diff --git a/aj-backend/aj-iam/aj-iam-server/pom.xml b/aj-backend/aj-iam/aj-iam-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ajaxjs</groupId>
         <artifactId>aj-common-parent</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
         <relativePath/>
     </parent>
     <artifactId>aj-iam-server</artifactId>

diff --git a/aj-backend/aj-iam/pom.xml b/aj-backend/aj-iam/pom.xml
@@ -2,6 +2,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ajaxjs</groupId>
+        <artifactId>ajaxjs-parent</artifactId>
+        <version>1.17</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
     <artifactId>aj-iam</artifactId>
     <version>1.0</version>
     <packaging>pom</packaging>
@@ -12,17 +18,4 @@
         <module>aj-iam-client</module>
         <module>aj-iam-server</module>
     </modules>
-
-    <parent>
-        <groupId>com.ajaxjs</groupId>
-        <artifactId>ajaxjs-parent</artifactId>
-        <version>1.11</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <!-- 当发生javadoc编译错误时继续执行 -->
-        <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
 </project>
diff --git a/aj-backend/pom.xml b/aj-backend/pom.xml
@@ -5,11 +5,11 @@
     <groupId>com.ajaxjs</groupId>
     <artifactId>ajaxjs-parent</artifactId>
     <name>ajaxjs-parent</name>
-    <version>1.16</version>
+    <version>1.17</version>
     <packaging>pom</packaging>
     <description>Public config for OpenSource Library</description>
 
-   <modules>
+    <modules>
         <module>aj-framework/aj-common-parent</module>
         <module>aj-framework/aj-json</module>
         <module>aj-framework/aj-framework</module>
@@ -24,7 +24,8 @@
         <java.version>1.8</java.version><!-- IDEA Maven 插件默认 Java 1.5 编译，这里强制声明一下 -->
         <tomcat.version>8.5.96</tomcat.version>
         <!--<tomcat.version>8.5.84</tomcat.version>-->
-        <spring.version>5.3.24</spring.version>
+       <!-- <spring.version>5.3.24</spring.version>-->
+        <spring.version>5.3.31</spring.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <failOnMissingWebXml>false</failOnMissingWebXml><!-- Servlet3 不需要 web.xml 问题 -->
@@ -104,7 +105,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>3.1.0</version>
-                        <!--<version>3.0.1</version>-->
                         <!--  <configuration>
                               <skip>true</skip>
                           </configuration>-->
@@ -124,7 +124,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>3.6.3</version>
-                        <!--<version>3.4.0</version>-->
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -147,7 +146,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
                         <version>3.3.0</version>
-                        <!-- <version>3.2.1</version>-->
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -197,6 +195,13 @@
 
     <!-- 公共依赖 -->
     <dependencies>
+        <!-- 通用日志接口-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>