This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 2b13217 SUBMARINE-1180. Fix the hibernate error in server
2b13217 is described below
commit 2b1321742e9f1b718b52e164212010f78e771ad7
Author: KUAN-HSUN-LI <[email protected]>
AuthorDate: Wed Jan 12 23:05:24 2022 +0800
SUBMARINE-1180. Fix the hibernate error in server
### What is this PR for?
Fix the bugs in the server.
1. hibernate dependency error
2. split interruptedexception from Exception
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1180
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: KUAN-HSUN-LI <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #866 from KUAN-HSUN-LI/SUBMARINE-1180 and squashes the following
commits:
ff993bc2 [KUAN-HSUN-LI] fix error
---
pom.xml | 7 ++++++-
submarine-server/server-core/pom.xml | 6 ------
.../src/main/java/org/apache/submarine/server/SubmarineServer.java | 2 ++
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 176735b..e71a798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
<minio.version>7.1.4</minio.version>
<cglib.version>3.3.0</cglib.version>
- <hibernate.version>5.6.0.Final</hibernate.version>
+ <hibernate.version>5.6.3.Final</hibernate.version>
<jboss.logging.version>3.4.2.Final</jboss.logging.version>
<bytebuddy.version>1.11.20</bytebuddy.version>
<mybatis.version>3.2.8</mybatis.version>
@@ -311,6 +311,11 @@
</dependency>
<!-- Submarine Server -->
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss.logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${bytebuddy.version}</version>
diff --git a/submarine-server/server-core/pom.xml
b/submarine-server/server-core/pom.xml
index 9dd3d16..2e53a6a 100644
--- a/submarine-server/server-core/pom.xml
+++ b/submarine-server/server-core/pom.xml
@@ -270,12 +270,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
index f8958f1..d2bf731 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
@@ -149,6 +149,8 @@ public class SubmarineServer extends ResourceConfig {
HibernateUtil.close();
jettyWebServer.stop();
Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ LOG.error("Interrupted exception:", e);
} catch (Exception e) {
LOG.error("Error while stopping servlet container", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
