feat: log-record-core 1.6.1 release for fixing pom

qqxx6661 · Jan 13, 2024 · f5d0c82 · f5d0c82
1 parent 0fec416
commit f5d0c82
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,8 @@ jobs:
         with:
           java-version: 8
           distribution: zulu
+      - name: Change to log-record-start directory
+        run: cd log-record-start
       - name: Cache mvn dependencies
         uses: actions/cache@v3
         env:
@@ -24,7 +26,7 @@ jobs:
           key: ${{ env.cache-name }}-${{ hashFiles('pom.xml') }}
           restore-keys: ${{ env.cache-name }}-
       - name: Test with Maven
-        run: mvn -V --no-transfer-progress test -pl '!log-record-springboot3-starter'
+        run: mvn -V --no-transfer-progress test
       - name: Upload to Codecov
         uses: codecov/codecov-action@v3
         with:

diff --git a/README.md b/README.md
@@ -254,7 +254,7 @@ SpringBoot3(JDK17+)请引用：
 
 > 最新版本号请查阅[`Maven`公共仓库](https://search.maven.org/artifact/cn.monitor4all/log-record-starter)
 > 
-> 推荐使用 >= 1.6.0版本
+> 推荐使用 >= 1.6.x版本
 
 
 **第二步：** 配置日志处理方式
@@ -548,7 +548,7 @@ public class CustomFunctionStatic {
 
 ~~原理主要是依靠我们框架内部转换，将非静态方法需要包装为静态方法再传给`SpEL`。原理详见[#PR25](https://github.com/qqxx6661/log-record/pull/25)~~
 
-在1.6.0版本之前，部分版本(1.5.x)支持非静态自定义函数，但由于其大量使用反射，写法较为Hack，兼容性不佳（在JDk11+后反射限制更加严格），在1.6.0+ 版本后删除，仅支持静态方法。
+在1.6.x版本之前，部分版本(1.5.x)支持非静态自定义函数，但由于其大量使用反射，写法较为Hack，兼容性不佳（在JDk11+后反射限制更加严格），在1.6.x+ 版本后删除，仅支持静态方法。
 
 
 

diff --git a/log-record-core/pom.xml b/log-record-core/pom.xml
@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.monitor4all</groupId>
-        <artifactId>log-record</artifactId>
-        <version>1.6.0</version>
-    </parent>
 
+    <name>${project.groupId}:${project.artifactId}</name>
+    <url>https://monitor4all.cn</url>
+    <description>A log record framework for Java</description>
+
+    <groupId>cn.monitor4all</groupId>
     <artifactId>log-record-core</artifactId>
+    <version>1.6.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -129,11 +130,11 @@
 
     <distributionManagement>
         <!--  申明打包到Github私有Maven仓库  -->
-<!--        <repository>-->
-<!--            <id>github</id>-->
-<!--            <name>GitHub OWNER Apache Maven Packages</name>-->
-<!--            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>-->
-<!--        </repository>-->
+        <repository>
+            <id>github</id>
+            <name>GitHub OWNER Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>
+        </repository>
 
         <!--  申明打包到Maven公有仓库  -->
         <snapshotRepository>
@@ -160,7 +161,10 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <doc.path>${java.home}/../bin/javadoc</doc.path>
+                <!-- JDK1.8 -->
+<!--                <doc.path>${java.home}/../bin/javadoc</doc.path>-->
+                <!-- JDK17 -->
+                <doc.path>${java.home}/bin/javadoc</doc.path>
             </properties>
             <build>
                 <plugins>

diff --git a/log-record-springboot3-starter/pom.xml b/log-record-springboot3-starter/pom.xml
@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.monitor4all</groupId>
-        <artifactId>log-record</artifactId>
-        <version>1.6.0</version>
-    </parent>
 
+    <name>${project.groupId}:${project.artifactId}</name>
+    <url>https://monitor4all.cn</url>
+    <description>A log record framework for Java</description>
+
+    <groupId>cn.monitor4all</groupId>
     <artifactId>log-record-springboot3-starter</artifactId>
+    <version>1.6.1</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -34,6 +35,7 @@
         <dependency>
             <groupId>cn.monitor4all</groupId>
             <artifactId>log-record-core</artifactId>
+            <version>1.6.1</version>
         </dependency>
 
         <!-- 单元测试依赖 -->
@@ -75,17 +77,17 @@
 
     <distributionManagement>
         <!--  申明打包到Github私有Maven仓库  -->
-<!--        <repository>-->
-<!--            <id>github</id>-->
-<!--            <name>GitHub OWNER Apache Maven Packages</name>-->
-<!--            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>-->
-<!--        </repository>-->
+        <repository>
+            <id>github</id>
+            <name>GitHub OWNER Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>
+        </repository>
 
         <!--  申明打包到Maven公有仓库  -->
-<!--        <snapshotRepository>-->
-<!--            <id>ossrh</id>-->
-<!--            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
-<!--        </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
 
 

diff --git a/log-record-starter/pom.xml b/log-record-starter/pom.xml
@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.monitor4all</groupId>
-        <artifactId>log-record</artifactId>
-        <version>1.6.0</version>
-    </parent>
 
+    <name>${project.groupId}:${project.artifactId}</name>
+    <url>https://monitor4all.cn</url>
+    <description>A log record framework for Java</description>
+
+    <groupId>cn.monitor4all</groupId>
     <artifactId>log-record-starter</artifactId>
+    <version>1.6.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -34,6 +35,7 @@
         <dependency>
             <groupId>cn.monitor4all</groupId>
             <artifactId>log-record-core</artifactId>
+            <version>1.6.1</version>
         </dependency>
 
         <!-- 单元测试依赖 -->
@@ -74,17 +76,17 @@
 
     <distributionManagement>
         <!--  申明打包到Github私有Maven仓库  -->
-<!--        <repository>-->
-<!--            <id>github</id>-->
-<!--            <name>GitHub OWNER Apache Maven Packages</name>-->
-<!--            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>-->
-<!--        </repository>-->
+        <repository>
+            <id>github</id>
+            <name>GitHub OWNER Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/qqxx6661/log-record</url>
+        </repository>
 
         <!--  申明打包到Maven公有仓库  -->
-<!--        <snapshotRepository>-->
-<!--            <id>ossrh</id>-->
-<!--            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
-<!--        </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
 
 

diff --git a/pom.xml b/pom.xml