You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/08/10 04:57:11 UTC
(shardingsphere) branch master updated: Move jaxb dependency to test module (#36230)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6aaa6155c46 Move jaxb dependency to test module (#36230)
6aaa6155c46 is described below
commit 6aaa6155c4601e703d0038f65d51914a86d86cd3
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Aug 10 12:57:05 2025 +0800
Move jaxb dependency to test module (#36230)
* Move jaxb dependency to test module
* Move jaxb dependency to test module
* Move jaxb dependency to test module
---
pom.xml | 8 --------
test/e2e/pom.xml | 13 ++++++++++++
test/it/pom.xml | 11 +++++++++++
test/pom.xml | 23 ++++++++--------------
.../test/util/ConfigurationFileUtils.java | 2 +-
5 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28a092c035a..b46cafb9c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
<bytebuddy.version>1.15.4</bytebuddy.version>
<jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
- <glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
<netty.version>4.1.121.Final</netty.version>
<bouncycastle.version>1.78.1</bouncycastle.version>
@@ -309,13 +308,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-bom</artifactId>
- <version>${glassfish-jaxb.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>org.freemarker</groupId>
diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml
index 66c2b7c29ce..355d86edb51 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -41,6 +41,19 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
diff --git a/test/it/pom.xml b/test/it/pom.xml
index 9f1a0fb48ca..25c41a96bc7 100644
--- a/test/it/pom.xml
+++ b/test/it/pom.xml
@@ -37,4 +37,15 @@
<module>pipeline</module>
<module>binder</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index 733f15d0b41..a77ac9b1a2a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -37,12 +37,20 @@
</modules>
<properties>
+ <glassfish-jaxb.version>2.3.9</glassfish-jaxb.version>
<testcontainers.version>1.21.3</testcontainers.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-bom</artifactId>
+ <version>${glassfish-jaxb.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
@@ -52,19 +60,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </dependency>
- </dependencies>
</project>
diff --git a/test/util/src/main/java/org/apache/shardingsphere/test/util/ConfigurationFileUtils.java b/test/util/src/main/java/org/apache/shardingsphere/test/util/ConfigurationFileUtils.java
index 46f62bebe97..b448972c2f5 100644
--- a/test/util/src/main/java/org/apache/shardingsphere/test/util/ConfigurationFileUtils.java
+++ b/test/util/src/main/java/org/apache/shardingsphere/test/util/ConfigurationFileUtils.java
@@ -53,6 +53,6 @@ public final class ConfigurationFileUtils {
@SneakyThrows({IOException.class, URISyntaxException.class})
public static String readFileAndIgnoreComments(final String fileName) {
return Files.readAllLines(Paths.get(ClassLoader.getSystemResource(fileName).toURI()))
- .stream().filter(each -> !"".equals(each) && !each.startsWith("#")).map(each -> each + System.lineSeparator()).collect(Collectors.joining());
+ .stream().filter(each -> !each.isEmpty() && !each.startsWith("#")).map(each -> each + System.lineSeparator()).collect(Collectors.joining());
}
}