This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 5ac2897ce0 QPID-8684: [Broker-J] Update nashorn to version 15.7 (#336)
5ac2897ce0 is described below
commit 5ac2897ce0678cd36b40b75ad2f558300ec0e267
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Fri Oct 3 12:50:17 2025 +0200
QPID-8684: [Broker-J] Update nashorn to version 15.7 (#336)
---
perftests/pom.xml | 21 ++++++++-------------
pom.xml | 2 +-
qpid-perftests-systests/pom.xml | 19 ++++++-------------
3 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/perftests/pom.xml b/perftests/pom.xml
index cb1da8a5ae..66e7992364 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -87,6 +87,7 @@
<artifactId>derby</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -109,6 +110,13 @@
<artifactId>qpid-test-utils</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -402,18 +410,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>nashorn</id>
- <activation>
- <jdk>[15,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index b2c530125f..840549287c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<httpclient-version>5.5</httpclient-version>
<qpid-jms-client-version>1.15.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.4.0</qpid-jms-client-amqp-0-x-version>
- <nashorn-version>15.6</nashorn-version>
+ <nashorn-version>15.7</nashorn-version>
<exec-maven-plugin-version>3.5.1</exec-maven-plugin-version>
<javacc-maven-plugin-version>3.1.1</javacc-maven-plugin-version>
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 48a7d87149..00ef33d0ee 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -56,6 +56,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -110,18 +116,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>nashorn</id>
- <activation>
- <jdk>[15,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]