Skip to content

refactor: remove JUnit 4 from dependency management #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wnqqnw19 wants to merge 1 commit into
base: 5.0.x
Choose a base branch
from
+5 −74
Open

refactor: remove JUnit 4 from dependency management #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# hsweb4 基于spring-boot2,全响应式的后台管理框架
# hsweb4 基于spring-boot3,全响应式的后台管理框架

[![Codecov](https://codecov.io/gh/hs-web/hsweb-framework/branch/4.0.x/graph/badge.svg)](https://codecov.io/gh/hs-web/hsweb-framework/branch/master)
[![Build Status](https://api.travis-ci.com/hs-web/hsweb-framework.svg?branch=4.0.x)](https://travis-ci.com/hs-web/hsweb-framework)
Expand Down Expand Up @@ -50,9 +50,9 @@ https://github.com/zhou-hao/hsweb4-examples

## 核心技术选型

1. Java 8
1. Java 17
2. Maven3
3. Spring Boot 2.x
3. Spring Boot 3.x
4. Project Reactor 响应式编程框架
5. hsweb easy orm 对r2dbc的orm封装

Expand Down
5 changes: 0 additions & 5 deletions hsweb-logging/hsweb-access-logging-aop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions ...main/java/org/hswebframework/web/logging/aop/AopAccessLoggerSupportAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ public DefaultAccessLoggerParser defaultAccessLoggerParser() {
return new DefaultAccessLoggerParser();
}

@Bean
@ConditionalOnClass(name = "io.swagger.annotations.Api")
@Order(10)
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public SwaggerAccessLoggerParser swaggerAccessLoggerParser() {
return new SwaggerAccessLoggerParser();
}

@Bean
@ConditionalOnClass(name = "io.swagger.v3.oas.annotations.tags.Tag")
@Order(1)
Expand Down
36 changes: 0 additions & 36 deletions ...gging-aop/src/main/java/org/hswebframework/web/logging/aop/SwaggerAccessLoggerParser.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hsweb-starter/src/main/resources/META-INF/spring.factories
View file
Open in desktop

This file was deleted.

22 changes: 2 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,11 @@

<fastjson.version>1.2.83</fastjson.version>
<h2.version>2.3.232</h2.version>
<mysql.version>5.1.39</mysql.version>
<cglib.version>3.2.2</cglib.version>
<aspectj.version>1.6.12</aspectj.version>

<hsweb.ezorm.version>4.2.2-SNAPSHOT</hsweb.ezorm.version>
<hsweb.utils.version>3.0.4</hsweb.utils.version>
<hsweb.expands.version>3.0.2</hsweb.expands.version>
<swagger.version>2.7.0</swagger.version>

<r2dbc.version>Borca-SR2</r2dbc.version>
</properties>

<profiles>
Expand Down Expand Up @@ -135,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.6.0</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
Expand Down Expand Up @@ -297,7 +292,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>3.2.5</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand Down Expand Up @@ -452,13 +447,6 @@
<version>0.9.13</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand All @@ -471,12 +459,6 @@
<version>${fastjson.version}</version>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.10</version>
</dependency>

<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
Expand Down