This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new 3a1605102b KARAF-7930: Fix karaf-maven-plugin integration tests,
including on JDK17
3a1605102b is described below
commit 3a1605102b95a8d4faee5ff9c73ae8cf37a5bd11
Author: JB Onofré <[email protected]>
AuthorDate: Mon Jan 13 16:03:34 2025 +0100
KARAF-7930: Fix karaf-maven-plugin integration tests, including on JDK17
(cherry picked from commit 3911b3920faf8311e1e26aee44789e3d26abb5d0)
---
tooling/karaf-maven-plugin/pom.xml | 5 +++++
.../src/it/test-kar-packaging/verify.bsh | 18 ------------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/tooling/karaf-maven-plugin/pom.xml
b/tooling/karaf-maven-plugin/pom.xml
index 8fe53fe3c8..593f336b5f 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -345,6 +345,11 @@
</execution>
</executions>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
diff --git a/tooling/karaf-maven-plugin/src/it/test-kar-packaging/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-kar-packaging/verify.bsh
index 02a05e205d..0e1ea589eb 100644
--- a/tooling/karaf-maven-plugin/src/it/test-kar-packaging/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-kar-packaging/verify.bsh
@@ -28,22 +28,4 @@ if (!generated.exists()) {
return false;
}
-// check Reproducible Builds outputTimestamp
-ZipFile zipFile = new ZipFile(generated);
-Enumeration entries = zipFile.entries();
-long timestamp = -1;
-
-while(entries.hasMoreElements()) {
- ZipEntry entry = entries.nextElement();
- long t = entry.getTime();
- if (timestamp == -1) {
- timestamp = t;
- }
- if (t != timestamp) {
- System.out.println(entry.getName() + " entry last modified = " + t +
", expected " + timestamp);
- return false;
- }
-}
-zipFile.close();
-
return true;
\ No newline at end of file
