Skip to content

Commit 22ae562

Browse files
mercyblitzmercyblitz
authored
Merge branch 'main' into release
2 parents 5f7c41f + ff1fe47 commit 22ae562

4 files changed

Lines changed: 25 additions & 114 deletions

File tree

‎.github/workflows/maven-publish.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,17 @@ jobs:
112112
git add pom.xml
113113
git diff --cached --quiet && echo "No changes to commit" || \
114114
git commit -m "chore: bump version to next patch after publishing ${{ inputs.revision }}" && git push
115+
116+
- name: Merge release into main
117+
run: |
118+
git config user.name "github-actions[bot]"
119+
git config user.email "github-actions[bot]@users.noreply.github.com"
120+
if ! git checkout main; then
121+
echo "::error::Branch 'main' does not exist. Skipping merge."
122+
exit 1
123+
fi
124+
if ! git merge --no-ff origin/release -m "chore: merge release into main [skip ci]"; then
125+
echo "::error::Merge conflict detected when merging release into main. Manual intervention required."
126+
exit 1
127+
fi
128+
git push origin main

‎microsphere-java-parent/pom.xml‎

Lines changed: 5 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -19,118 +19,23 @@
1919
<description>Microsphere Java Parent</description>
2020

2121
<properties>
22-
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
23-
<javax.ws.rs.version>2.1</javax.ws.rs.version>
24-
<jaxws-api.version>2.3.1</jaxws-api.version>
25-
<jsr305.version>3.0.2</jsr305.version>
26-
<apache.commons.logging.version>1.3.6</apache.commons.logging.version>
22+
<microsphere-bom.version>0.1.3</microsphere-bom.version>
2723
<spring-framework.version>7.0.6</spring-framework.version>
28-
<slf4j.version>2.0.17</slf4j.version>
29-
<logback.version>1.5.32</logback.version>
30-
<!-- Testing -->
31-
<junit-jupiter.version>6.0.3</junit-jupiter.version>
32-
<mockito.version>5.23.0</mockito.version>
33-
<jmh.version>1.37</jmh.version>
3424
</properties>
3525

3626
<dependencyManagement>
3727

3828
<dependencies>
3929

40-
<!-- Java Commons Annotations API -->
30+
<!-- Microsphere all BOM -->
4131
<dependency>
42-
<groupId>javax.annotation</groupId>
43-
<artifactId>javax.annotation-api</artifactId>
44-
<version>${javax.annotation-api.version}</version>
45-
</dependency>
46-
47-
<!-- JAX-RS API -->
48-
<dependency>
49-
<groupId>javax.ws.rs</groupId>
50-
<artifactId>javax.ws.rs-api</artifactId>
51-
<version>${javax.ws.rs.version}</version>
52-
<optional>true</optional>
53-
</dependency>
54-
55-
<!-- JAX-WS API-->
56-
<dependency>
57-
<groupId>javax.xml.ws</groupId>
58-
<artifactId>jaxws-api</artifactId>
59-
<version>${jaxws-api.version}</version>
60-
<optional>true</optional>
61-
</dependency>
62-
63-
<!-- JSR 305 -->
64-
<dependency>
65-
<groupId>com.google.code.findbugs</groupId>
66-
<artifactId>jsr305</artifactId>
67-
<version>${jsr305.version}</version>
68-
</dependency>
69-
70-
<!-- Apache Commons Dependencies -->
71-
<dependency>
72-
<groupId>commons-logging</groupId>
73-
<artifactId>commons-logging</artifactId>
74-
<version>${apache.commons.logging.version}</version>
75-
</dependency>
76-
77-
<!-- Logging -->
78-
<dependency>
79-
<groupId>org.slf4j</groupId>
80-
<artifactId>slf4j-api</artifactId>
81-
<version>${slf4j.version}</version>
82-
</dependency>
83-
84-
<!-- Logback -->
85-
<dependency>
86-
<groupId>ch.qos.logback</groupId>
87-
<artifactId>logback-classic</artifactId>
88-
<version>${logback.version}</version>
89-
</dependency>
90-
91-
<dependency>
92-
<groupId>ch.qos.logback</groupId>
93-
<artifactId>logback-core</artifactId>
94-
<version>${logback.version}</version>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>ch.qos.logback</groupId>
99-
<artifactId>logback-access</artifactId>
100-
<version>${logback.version}</version>
101-
</dependency>
102-
103-
<!-- Testing -->
104-
105-
<!-- JUnit BOM -->
106-
<dependency>
107-
<groupId>org.junit</groupId>
108-
<artifactId>junit-bom</artifactId>
109-
<version>${junit-jupiter.version}</version>
32+
<groupId>io.github.microsphere-projects</groupId>
33+
<artifactId>microsphere-all-bom</artifactId>
34+
<version>${microsphere-bom.version}</version>
11035
<type>pom</type>
11136
<scope>import</scope>
11237
</dependency>
11338

114-
<!-- Mockito -->
115-
<dependency>
116-
<groupId>org.mockito</groupId>
117-
<artifactId>mockito-core</artifactId>
118-
<version>${mockito.version}</version>
119-
</dependency>
120-
121-
<!-- JMH -->
122-
<dependency>
123-
<groupId>org.openjdk.jmh</groupId>
124-
<artifactId>jmh-core</artifactId>
125-
<version>${jmh.version}</version>
126-
</dependency>
127-
128-
<dependency>
129-
<groupId>org.openjdk.jmh</groupId>
130-
<artifactId>jmh-generator-annprocess</artifactId>
131-
<version>${jmh.version}</version>
132-
</dependency>
133-
13439
<!-- Spring Framework BOM -->
13540
<dependency>
13641
<groupId>org.springframework</groupId>
@@ -146,25 +51,13 @@
14651

14752
<profiles>
14853

149-
<profile>
150-
<id>java8-10</id>
151-
<activation>
152-
<jdk>[1.8,11)</jdk>
153-
</activation>
154-
<properties>
155-
<logback.version>1.3.16</logback.version>
156-
</properties>
157-
</profile>
158-
15954
<profile>
16055
<id>java8-16</id>
16156
<activation>
16257
<jdk>[1.8,17)</jdk>
16358
</activation>
16459
<properties>
16560
<spring-framework.version>5.3.39</spring-framework.version>
166-
<junit-jupiter.version>5.14.3</junit-jupiter.version>
167-
<mockito.version>4.11.0</mockito.version>
16861
</properties>
16962
</profile>
17063

‎microsphere-java-test/src/main/resources/logback-test.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
</encoder>
99
</appender>
1010

11-
<root level="TRACE">
11+
<root level="INFO">
1212
<appender-ref ref="STDOUT"/>
1313
</root>
1414

15+
<logger name="io.microsphere" level="TRACE" additivity="false">
16+
<appender-ref ref="STDOUT"/>
17+
</logger>
18+
1519
</configuration>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</scm>
5252

5353
<properties>
54-
<revision>0.2.3-SNAPSHOT</revision>
54+
<revision>0.2.3</revision>
5555
</properties>
5656

5757
<modules>

0 commit comments

Comments
 (0)