Skip to content

Commit f2c38f0

Browse files
authored
Merge pull request #3 from mercyblitz/dev-1.x
Dev 1.x
2 parents 6e11c4a + 5495652 commit f2c38f0

6 files changed

Lines changed: 39 additions & 37 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ name: Maven Build
1010

1111
on:
1212
push:
13-
branches: [ 'dev' ]
13+
branches: [ 'dev-1.x' ]
1414
pull_request:
15-
branches: [ 'main', 'dev' , 'release' ]
15+
branches: [ 'dev-1.x' , 'release-1.x' ]
1616

1717
jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
java: [ '17' , '21' , '25' ]
22+
java: [ '8', '11' , '17' , '21' ,' 25' ]
2323
steps:
2424
- name: Checkout Source
2525
uses: actions/checkout@v5

.github/workflows/maven-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ name: Maven Publish
1010

1111
on:
1212
push:
13-
branches: [ 'release' ]
13+
branches: [ 'release-1.x' ]
1414
workflow_dispatch:
1515
inputs:
1616
revision:
1717
description: 'The version to publish'
1818
required: true
19-
default: '2.0.0-SNAPSHOT'
19+
default: '1.0.0-SNAPSHOT'
2020

2121
jobs:
2222
build:

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/microsphere-projects/microsphere-logging)
66
[![Maven Build](https://github.com/microsphere-projects/microsphere-logging/actions/workflows/maven-build.yml/badge.svg)](https://github.com/microsphere-projects/microsphere-logging/actions/workflows/maven-build.yml)
7-
[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-logging/branch/dev/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-logging)
7+
[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-logging/branch/dev-1.x/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-logging)
88
![Maven](https://img.shields.io/maven-central/v/io.github.microsphere-projects/microsphere-logging.svg)
99
![License](https://img.shields.io/github/license/microsphere-projects/microsphere-logging.svg)
1010

@@ -20,12 +20,13 @@ TODO
2020

2121
The framework is organized into several key modules:
2222

23-
Module | Purpose
24-
----------------------------------|-----------------------------------------------------------------------------------------------------
25-
microsphere-logging-core | Provides the core utilities across various domains like annotations, collections, concurrency, etc.
26-
microsphere-logging-test | Provides the models and components for logging testing.
27-
microsphere-logging-dependencies | Manages dependency versions across the project.
28-
microsphere-logging-parent | Parent POM with shared configurations.
23+
Module | Purpose
24+
----------------------------------|-------------------------------------------------------------------------
25+
microsphere-logging-parent | Parent POM with shared configurations.
26+
microsphere-logging-dependencies | Manages dependency versions across the project.
27+
microsphere-logging-core | Provides the core features for logging.
28+
microsphere-logging-logback | Provides the extensions features for logback.
29+
microsphere-logging-test | Provides the extensions of JUnit4 or JUnit Jupiter for logging testing.
2930

3031
## Getting Started
3132

microsphere-logging-core/src/test/java/io/microsphere/logging/ThrowableLogging.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
import java.util.List;
2121
import java.util.Set;
2222

23+
import static java.util.Collections.emptyList;
24+
import static java.util.Collections.emptySet;
25+
2326
/**
2427
* Throwable {@link Logging}
2528
*
@@ -31,12 +34,12 @@ public class ThrowableLogging implements Logging {
3134

3235
@Override
3336
public List<String> getLoggerNames() {
34-
return List.of();
37+
return emptyList();
3538
}
3639

3740
@Override
3841
public Set<String> getSupportedLoggingLevels() {
39-
return Set.of();
42+
return emptySet();
4043
}
4144

4245
@Override
@@ -46,7 +49,6 @@ public String getLoggerLevel(String loggerName) {
4649

4750
@Override
4851
public void setLoggerLevel(String loggerName, String levelName) {
49-
5052
}
5153

5254
@Override
@@ -58,4 +60,4 @@ public String getParentLoggerName(String loggerName) {
5860
public String getName() {
5961
throw new RuntimeException("For testing...");
6062
}
61-
}
63+
}

microsphere-logging-parent/pom.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,33 @@
2222
<microsphere-java.version>0.1.8</microsphere-java.version>
2323
<jsr305.version>3.0.2</jsr305.version>
2424
<apache-commons-logging.version>1.3.2</apache-commons-logging.version>
25-
<slf4j.version>2.0.17</slf4j.version>
25+
<slf4j.version>1.7.36</slf4j.version>
26+
<logback.version>1.2.12</logback.version>
2627
<log4j.version>1.2.17</log4j.version>
2728
<log4j2.version>2.25.3</log4j2.version>
28-
<logback.version>1.5.32</logback.version>
2929
<junit.version>4.13.2</junit.version>
30-
<junit-jupiter.version>6.0.3</junit-jupiter.version>
30+
<junit-jupiter.version>5.14.3</junit-jupiter.version>
3131
</properties>
3232

3333
<dependencyManagement>
3434
<dependencies>
3535

36+
<!-- JUnit BOM -->
37+
<dependency>
38+
<groupId>org.junit</groupId>
39+
<artifactId>junit-bom</artifactId>
40+
<version>${junit-jupiter.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
44+
45+
<!-- JUnit -->
46+
<dependency>
47+
<groupId>junit</groupId>
48+
<artifactId>junit</artifactId>
49+
<version>${junit.version}</version>
50+
</dependency>
51+
3652
<!-- Microsphere Java Dependencies -->
3753
<dependency>
3854
<groupId>io.github.microsphere-projects</groupId>
@@ -90,22 +106,6 @@
90106
<version>${logback.version}</version>
91107
</dependency>
92108

93-
<!-- JUnit BOM -->
94-
<dependency>
95-
<groupId>org.junit</groupId>
96-
<artifactId>junit-bom</artifactId>
97-
<version>${junit-jupiter.version}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
102-
<!-- JUnit -->
103-
<dependency>
104-
<groupId>junit</groupId>
105-
<artifactId>junit</artifactId>
106-
<version>${junit.version}</version>
107-
</dependency>
108-
109109
</dependencies>
110110
</dependencyManagement>
111111

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
</scm>
5353

5454
<properties>
55-
<revision>0.2.0-SNAPSHOT</revision>
56-
<java.version>17</java.version>
55+
<revision>0.1.0-SNAPSHOT</revision>
5756
</properties>
5857

5958
<modules>

0 commit comments

Comments
 (0)