From 9b9537e09fb12fb5250980f310ed0f0d5b81b06f Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Fri, 20 Dec 2024 12:00:47 +0800 Subject: [PATCH 1/5] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06b0cd78f..aa8e14a1e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ - 0.0.9 + 0.0.10-SNAPSHOT From 1b773be5c7e835cd3c1302fb2afbdc9b1ce372c6 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Fri, 20 Dec 2024 18:21:00 +0800 Subject: [PATCH 2/5] Update microsphere-build to be '0.0.22' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa8e14a1e..73c8c2375 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.microsphere-projects microsphere-build - 0.0.21 + 0.0.22 io.github.microsphere-projects From 3ce9420d28e720b44cb7d647ba8795fee4d97478 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Fri, 20 Dec 2024 18:21:12 +0800 Subject: [PATCH 3/5] Update pom.xml --- microsphere-java-core/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/microsphere-java-core/pom.xml b/microsphere-java-core/pom.xml index 9170c96ec..8fdb6a347 100644 --- a/microsphere-java-core/pom.xml +++ b/microsphere-java-core/pom.xml @@ -97,6 +97,15 @@ + + + + org.jacoco + jacoco-maven-plugin + + + + jigsaw From 6065231f8a7cadb9b2768695918764c797d38678 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Fri, 20 Dec 2024 18:34:52 +0800 Subject: [PATCH 4/5] Integration coverage --- .github/workflows/maven-build.yml | 10 +++++++++- microsphere-java-core/pom.xml | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index c3457501c..95e8a9259 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -23,11 +23,19 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 + - name: Setup JDK ${{ matrix.Java }} uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ matrix.java }} cache: maven + - name: Build with Maven - run: mvn --batch-mode --update-snapshots --file pom.xml -Drevision=0.0.1-SNAPSHOT clean install \ No newline at end of file + run: mvn --batch-mode --update-snapshots --file pom.xml -Drevision=0.0.1-SNAPSHOT clean install + + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v5 + with: + token: ${{ secrets.CODECOV_TOKEN }} + slug: microsphere-projects/microsphere-java \ No newline at end of file diff --git a/microsphere-java-core/pom.xml b/microsphere-java-core/pom.xml index 8fdb6a347..59e364e49 100644 --- a/microsphere-java-core/pom.xml +++ b/microsphere-java-core/pom.xml @@ -102,6 +102,21 @@ org.jacoco jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + report + test + + report + + + From cf1e167c9efa75f1e18ccac4b78ec3bc0ea26281 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Sat, 21 Dec 2024 17:18:01 +0800 Subject: [PATCH 5/5] Update pom.xml --- microsphere-java-core/pom.xml | 85 ++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/microsphere-java-core/pom.xml b/microsphere-java-core/pom.xml index 59e364e49..ee7fbe708 100644 --- a/microsphere-java-core/pom.xml +++ b/microsphere-java-core/pom.xml @@ -18,6 +18,10 @@ Microsphere :: Java :: Core Microsphere Java Core + + + + @@ -100,32 +104,21 @@ - org.jacoco - jacoco-maven-plugin - - - prepare-agent - - prepare-agent - - - - report - test - - report - - - + org.apache.maven.plugins + maven-surefire-plugin + + ${surefire.argLine} + + - jigsaw + javax-api - [1.9,) + [9,) @@ -134,21 +127,63 @@ javax.annotation-api + + + + jdk9-15 + + [9,15] + + + + --illegal-access=permit + --add-opens java.base/java.lang.invoke=ALL-UNNAMED + + + + + + jdk16+ + + [16,) + + + + --add-opens java.base/java.lang.invoke=ALL-UNNAMED + + + + + + coverage - org.apache.maven.plugins - maven-surefire-plugin + org.jacoco + jacoco-maven-plugin - - --illegal-access=permit - --add-opens java.base/java.lang.invoke=ALL-UNNAMED - + ${project.build.directory}/jacoco.exec + + + prepare-agent + + prepare-agent + + + + report + test + + report + + + + \ No newline at end of file