Skip to content
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

Jump to bottom

remove mysql-oracle dependency jar from release package lib #1680

Merged
merged 2 commits into from
Mar 22, 2024
Merged

remove mysql-oracle dependency jar from release package lib #1680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0315b
remove mysql-oracle dependency jar from release package lib
tomsun28 Mar 22, 2024
eda6558
Merge branch 'master' into remove-unlicense-dependen
wang1027-wqh Mar 22, 2024
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
3 changes: 3 additions & 0 deletions collector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>provided</scope>
</dependency>
<!-- clickhouse -->
<dependency>
Expand Down Expand Up @@ -147,10 +148,12 @@
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<scope>provided</scope>
</dependency>
<!--redis-->
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ public class JdbcSpiLoader implements CommandLineRunner {
public void run(String... args) throws Exception {
log.info("start load jdbc drivers");
try {
Class.forName("com.mysql.cj.jdbc.Driver");
Class.forName("org.postgresql.Driver");
Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
Class.forName("oracle.jdbc.driver.OracleDriver");
Class.forName("dm.jdbc.driver.DmDriver");
Class.forName("com.clickhouse.jdbc.ClickHouseDriver");
} catch (Exception e) {
log.error("load jdbc error: {}", e.getMessage(), e);
log.error("load jdbc error: {}", e.getMessage());
}
log.info("end load jdbc drivers");
}
Expand Down
1 change: 1 addition & 0 deletions manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>provided</scope>
</dependency>
<!-- email -->
<dependency>
Expand Down
Loading