This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch amq6 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e082bd53ae10bafc37b7d6c0aec26e3a902c63fc Author: Markus Jung <ju...@apache.org> AuthorDate: Fri Apr 12 08:19:46 2024 +0200 Add ScriptEngine implementation for js in tomee-embedded-maven-plugin as well --- examples/testing-security-4/pom.xml | 23 ++++++----------------- maven/tomee-embedded-maven-plugin/pom.xml | 5 +++++ pom.xml | 7 +++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 2b6e8ffb1c..e1155c881b 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -70,6 +70,12 @@ <version>4.13.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.openjdk.nashorn</groupId> + <artifactId>nashorn-core</artifactId> + <version>15.4</version> + <scope>test</scope> + </dependency> <!-- The <scope>test</scope> guarantees that non of your runtime code is dependent on any OpenEJB classes. @@ -96,21 +102,4 @@ <url>file://${basedir}/target/snapshot-repo/</url> </snapshotRepository> </distributionManagement> - - <profiles> - <profile> - <id>jdk15+</id> - <activation> - <jdk>[15,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.openjdk.nashorn</groupId> - <artifactId>nashorn-core</artifactId> - <version>15.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> </project> diff --git a/maven/tomee-embedded-maven-plugin/pom.xml b/maven/tomee-embedded-maven-plugin/pom.xml index 5b8000565e..4ef3a40b82 100644 --- a/maven/tomee-embedded-maven-plugin/pom.xml +++ b/maven/tomee-embedded-maven-plugin/pom.xml @@ -62,6 +62,11 @@ <artifactId>livereload-tomee</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.openjdk.nashorn</groupId> + <artifactId>nashorn-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <properties> diff --git a/pom.xml b/pom.xml index e12a0dcfe0..2f5d98fd67 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,7 @@ <version.osgi.framework>4.2.0</version.osgi.framework> <version.aether>1.13.1</version.aether> <version.xalan>2.7.2</version.xalan> + <version.nashorn>15.4</version.nashorn> <!-- Logging frameworks --> <version.slf4j>2.0.12</version.slf4j> @@ -1394,6 +1395,12 @@ <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.openjdk.nashorn</groupId> + <artifactId>nashorn-core</artifactId> + <version>${version.nashorn}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>com.agical.rmock</groupId> <artifactId>rmock</artifactId>