Merge pull request #21 from microsphere-projects/main

Release 0.0.6

Author: mercyblitz

.github/workflows/maven.yml .github/workflows/maven-build.yml.github/workflows/maven.yml renamed to .github/workflows/maven-build.yml

@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Java CI with Maven
+name: Maven Build
 
 on:
   push:
@@ -19,10 +19,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ '8', '11' , '17' , '21' ]
     steps:
-      - uses: actions/checkout@v4
-      - name: Java ${{ matrix.Java }}
+      - name: Checkout Source
+        uses: actions/checkout@v4
+      - name: Setup JDK ${{ matrix.Java }}
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'

.github/workflows/maven-publish.yml

@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Maven Publish
+
+on:
+  push:
+    branches: [ 'release' ]
+  workflow_dispatch:
+    inputs:
+      revision:
+        description: 'The version to release'
+        required: true
+        default: '0.0.1-SNAPSHOT'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if:  ${{ inputs.revision }}
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v4
+
+      - name: Setup Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          cache: maven
+
+      - name: Publish package
+        run: mvn --batch-mode --update-snapshots -Drevision=${{ inputs.revision }} -Prelease clean deploy
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+          MAVEN_GPG_KEY: ${{ secrets.OSS_SIGNING_KEY }}
+          MAVEN_GPG_PASSPHRASE : ${{ secrets.OSS_SIGNING_PASSWORD }}

README.md

@@ -1,2 +1,2 @@
 # microsphere-framework
-The common feautres used in the other microsphere sub-projects
+The common features used in the other microsphere sub-projects

microsphere-annotation-processor/pom.xml

@@ -27,13 +27,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- Third-Party Dependencies -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/util/LoggerUtils.java

@@ -18,8 +18,9 @@
 
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
 
 import static java.lang.String.format;
 

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/util/FieldUtilsTest.java

@@ -87,7 +87,7 @@ public void testGetDeclaredFields() {
     }
 
     @Test
-    public void testGetAllDeclaredFields() {
+    public void testFindAllDeclaredFields() {
         TypeElement type = getType(Model.class);
 
         List<VariableElement> fields = getAllDeclaredFields(type);

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/util/MethodUtilsTest.java

@@ -66,7 +66,7 @@ public void testDeclaredMethods() {
         assertEquals(12, methods.size());
 
         methods = getAllDeclaredMethods(type);
-        assertEquals(34, methods.size());
+        assertTrue(methods.size() >= 33);
 
         assertTrue(getAllDeclaredMethods((TypeElement) null).isEmpty());
         assertTrue(getAllDeclaredMethods((TypeMirror) null).isEmpty());

microsphere-java-core/pom.xml

@@ -20,38 +20,28 @@
 
     <dependencies>
 
-        <!-- Java Common Annotations -->
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Java API Dependencies -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <optional>true</optional>
         </dependency>
 
-        <!-- Apache Commons Dependencies -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
         <!-- Third-Party Dependencies -->
+        <!-- SLF4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <optional>true</optional>
         </dependency>
 
+        <!-- Apache Commons Logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -78,6 +68,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Java Common Annotations -->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -112,6 +110,20 @@
                     <artifactId>javax.annotation-api</artifactId>
                 </dependency>
             </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>
+                                --illegal-access=permit
+                                --add-opens java.base/java.lang.invoke=ALL-UNNAMED
+                            </argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 

microsphere-java-core/src/main/java/io/microsphere/beans/BeanProperty.java

@@ -92,12 +92,11 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("BeanProperty{");
-        sb.append("name='").append(name).append('\'');
-        sb.append(", value=").append(value);
-        sb.append(", declaringClass=").append(declaringClass);
-        sb.append(", descriptor=").append(descriptor);
-        sb.append('}');
-        return sb.toString();
+        String sb = "BeanProperty{" + "name='" + name + '\'' +
+                ", value=" + value +
+                ", declaringClass=" + declaringClass +
+                ", descriptor=" + descriptor +
+                '}';
+        return sb;
     }
 }

microsphere-java-core/src/main/java/io/microsphere/classloading/AbstractArtifactResolver.java

@@ -1,7 +1,6 @@
 package io.microsphere.classloading;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,6 +10,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.net.URLUtils.resolveArchiveFile;
 
 /**
@@ -21,7 +21,7 @@
  */
 public abstract class AbstractArtifactResolver implements ArtifactResolver {
 
-    protected final Logger logger = LoggerFactory.getLogger(getClass());
+    protected final Logger logger = getLogger(getClass());
 
     private int priority;