Skip to content
Merged

Dev #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bb8f9ec
Merge pull request #36 from microsphere-projects/dev
mercyblitz Dec 18, 2024
0a51866
Merge pull request #37 from microsphere-projects/dev
mercyblitz Dec 18, 2024
d791ab4
Merge pull request #41 from microsphere-projects/release
mercyblitz Dec 20, 2024
9b9537e
Update pom.xml
mercyblitz Dec 20, 2024
1b773be
Update microsphere-build to be '0.0.22'
mercyblitz Dec 20, 2024
3ce9420
Update pom.xml
mercyblitz Dec 20, 2024
6065231
Integration coverage
mercyblitz Dec 20, 2024
3c29d83
Create dependabot.yml
mercyblitz Dec 21, 2024
5bb106c
Bump org.antlr:antlr4-runtime from 4.13.1 to 4.13.2
dependabot[bot] Dec 21, 2024
db6772f
Bump com.google.code.findbugs:jsr305 from 3.0.1 to 3.0.2
dependabot[bot] Dec 21, 2024
cf1e167
Update pom.xml
mercyblitz Dec 21, 2024
4c3d521
Merge pull request #47 from microsphere-projects/dependabot/maven/com…
mercyblitz Dec 21, 2024
c8d2317
Merge pull request #46 from microsphere-projects/dependabot/maven/org…
mercyblitz Dec 21, 2024
629dc4e
Merge pull request #42 from microsphere-projects/dev
mercyblitz Dec 21, 2024
18df77b
Merge pull request #48 from microsphere-projects/main
mercyblitz Dec 21, 2024
ac63153
Update AnnotationUtilsTest.java
mercyblitz Dec 21, 2024
dc5f93b
Remove javax.xml.ws: jaxws-api
mercyblitz Dec 21, 2024
572bb22
Remove the dependency javax.annotation:javax.annotation-api
mercyblitz Dec 21, 2024
2b5b43e
Update JmxUtils.java
mercyblitz Dec 22, 2024
8553da6
Update JmxUtilsTest.java
mercyblitz Dec 22, 2024
635a8e3
Update ManagementUtils.java
mercyblitz Dec 22, 2024
38ed4a2
Update ClassLoaderUtils.java
mercyblitz Dec 22, 2024
1dd5bd5
Update ClassPathUtils.java
mercyblitz Dec 22, 2024
bb65d64
Update ManagementUtils.java
mercyblitz Dec 22, 2024
e2bea85
Update FilterUtils.java
mercyblitz Dec 22, 2024
a2137c2
Update FileUtils.java
mercyblitz Dec 22, 2024
3448399
Update UnsafeUtils.java
mercyblitz Dec 22, 2024
dec2a2b
Update URLUtils.java
mercyblitz Dec 22, 2024
83d3d90
Update FormatUtils.java
mercyblitz Dec 22, 2024
823ea77
Update JarUtils.java
mercyblitz Dec 22, 2024
fdaba9d
Update StringUtils.java
mercyblitz Dec 22, 2024
eddd8f1
Update pom.xml
mercyblitz Dec 22, 2024
2e61c9e
Update JmxUtilsTest.java
mercyblitz Dec 22, 2024
2845046
Update MethodUtilsTest.java
mercyblitz Dec 22, 2024
542f70c
Update JmxUtils.java
mercyblitz Dec 22, 2024
77088fc
Update pom.xml
mercyblitz Dec 23, 2024
143b39f
Update maven-build.yml
mercyblitz Dec 23, 2024
054dfb5
Update dependabot.yml
mercyblitz Dec 23, 2024
e21df2a
Update maven-build.yml
mercyblitz Dec 23, 2024
41d6814
Update maven-build.yml
mercyblitz Dec 23, 2024
70e7b5d
Update pom.xml
mercyblitz Dec 23, 2024
ec931dc
Update MethodUtilsTest.java
mercyblitz Dec 23, 2024
e4121d5
Polish #55
mercyblitz Dec 23, 2024
a834c6b
Merge pull request #49 from microsphere-projects/dev
mercyblitz Dec 23, 2024
efcb2be
Update pom.xml
mercyblitz Dec 24, 2024
b3976d2
Update pom.xml
mercyblitz Dec 24, 2024
ced2817
Update maven-build.yml
mercyblitz Dec 24, 2024
00de58b
Update maven-publish.yml
mercyblitz Dec 24, 2024
51c0a36
Merge pull request #58 from microsphere-projects/dev
mercyblitz Dec 24, 2024
0873265
Update README.md
mercyblitz Dec 24, 2024
9414b3e
Merge pull request #59 from microsphere-projects/main
mercyblitz Dec 24, 2024
ebd378a
Update MethodUtils.java
mercyblitz Dec 26, 2024
04f6d46
Merge branch 'dev' of github.com:microsphere-projects/microsphere-jav…
mercyblitz Dec 26, 2024
f561042
Update Github Actions
mercyblitz Feb 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10
18 changes: 16 additions & 2 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Maven Build

on:
push:
branches: [ "main" ]
branches: [ "dev" ]
pull_request:
branches: [ "main" ]

Expand All @@ -23,11 +23,25 @@ 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
run: mvn
--batch-mode
--update-snapshots
--file pom.xml
-Drevision=0.0.1-SNAPSHOT
test
--activate-profiles test,coverage

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: microsphere-projects/microsphere-java
9 changes: 8 additions & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,14 @@ jobs:
cache: maven

- name: Publish package
run: mvn --batch-mode --update-snapshots -Drevision=${{ inputs.revision }} -Dgpg.skip=true -Prelease,ci clean deploy
run: mvn
--batch-mode
--update-snapshots
--file pom.xml
-Drevision=${{ inputs.revision }}
-Dgpg.skip=true
deploy
--activate-profiles release,ci
env:
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
Expand Down
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
# microsphere-framework
The common features used in the other microsphere sub-projects
# Microsphere Java Framework
> The common features used in the other microsphere sub-projects

[![Maven Build](https://github.com/microsphere-projects/microsphere-java/actions/workflows/maven-build.yml/badge.svg)](https://github.com/microsphere-projects/microsphere-java/actions/workflows/maven-build.yml)
[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-java/branch/main/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-java)
![Maven](https://img.shields.io/maven-central/v/io.github.microsphere-projects/microsphere-java.svg)
![License](https://img.shields.io/github/license/microsphere-projects/microsphere-java.svg)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/microsphere-projects/microsphere-java.svg)](http://isitmaintained.com/project/microsphere-projects/microsphere-java "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/microsphere-projects/microsphere-java.svg)](http://isitmaintained.com/project/microsphere-projects/microsphere-java "Percentage of issues still open")
9 changes: 7 additions & 2 deletions microsphere-annotation-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<name>Microsphere :: Java :: Annotation Processor</name>
<description>Microsphere Annotation Processor</description>

<properties>
<javax.ws.rs.version>2.1</javax.ws.rs.version>
<jaxws-api.version>2.3.1</jaxws-api.version>
</properties>

<dependencies>

<!-- microsphere-->
Expand All @@ -44,28 +49,28 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax.ws.rs.version}</version>
<scope>test</scope>
</dependency>

<!-- JAX-WS API-->
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>${jaxws-api.version}</version>
<scope>test</scope>
</dependency>

<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

Expand Down
53 changes: 8 additions & 45 deletions microsphere-java-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
<optional>true</optional>
</dependency>

<!-- Java Common Annotations -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<optional>true</optional>
</dependency>

<!-- Third-Party Dependencies -->
<!-- SLF4j -->
<dependency>
Expand Down Expand Up @@ -55,31 +62,17 @@
<scope>test</scope>
</dependency>

<!-- JAX-WS API-->
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<scope>test</scope>
</dependency>

<!-- Logback -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<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>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -97,34 +90,4 @@

</dependencies>

<profiles>
<profile>
<id>jigsaw</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<dependencies>
<!-- Java Common Annotations -->
<dependency>
<groupId>javax.annotation</groupId>
<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>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/
package io.microsphere.filter;

import io.microsphere.util.BaseUtils;

import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Iterator;
Expand All @@ -18,7 +20,7 @@
* @see FilterUtils
* @since 1.0.0
*/
public abstract class FilterUtils {
public abstract class FilterUtils extends BaseUtils {

private FilterUtils() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/
package io.microsphere.io;

import io.microsphere.util.BaseUtils;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -21,7 +23,7 @@
* @see FileUtils
* @since 1.0.0
*/
public abstract class FileUtils {
public abstract class FileUtils extends BaseUtils {

/**
* Resolve Relative Path
Expand Down
Loading