This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new d35d9b32b0 TOMEE-4028- Remove cucumber shading and replace with
cucumber-jakarta-openejb
d35d9b32b0 is described below
commit d35d9b32b059a470cabe1f8b906d39d47651c3fc
Author: Richard Zowalla <[email protected]>
AuthorDate: Tue Aug 23 12:02:25 2022 +0200
TOMEE-4028- Remove cucumber shading and replace with
cucumber-jakarta-openejb
---
deps/cucumber-openejb-shade/pom.xml | 79 ------------------------------------
deps/pom.xml | 1 -
examples/cucumber-jvm/README.adoc | 13 +++---
examples/cucumber-jvm/README_pt.adoc | 13 +++---
examples/cucumber-jvm/pom.xml | 11 +++--
5 files changed, 17 insertions(+), 100 deletions(-)
diff --git a/deps/cucumber-openejb-shade/pom.xml
b/deps/cucumber-openejb-shade/pom.xml
deleted file mode 100644
index 9b2b3242dd..0000000000
--- a/deps/cucumber-openejb-shade/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M9-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>cucumber-openejb-shade</artifactId>
- <name>TomEE :: Deps :: Cucumber Openejb Shade</name>
-
- <properties>
-
<dependency.version.cucumber.openejb>7.3.2</dependency.version.cucumber.openejb>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-openejb</artifactId>
- <version>${dependency.version.cucumber.openejb}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>io.cucumber:cucumber-openejb</include> <!-- only
cucumber-openejb to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/pom.xml b/deps/pom.xml
index edaae632b7..9b7a8af886 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -38,7 +38,6 @@
<module>activemq-ra-shade</module>
<module>commons-dbcp2-shade</module>
<module>commons-fileupload-shade</module>
- <module>cucumber-openejb-shade</module>
</modules>
<build>
<plugins>
diff --git a/examples/cucumber-jvm/README.adoc
b/examples/cucumber-jvm/README.adoc
index 5d63064bc3..da8dd166ee 100644
--- a/examples/cucumber-jvm/README.adoc
+++ b/examples/cucumber-jvm/README.adoc
@@ -15,15 +15,14 @@ Cucumber was originally written in the Ruby programming
language, but now suppor
Is the pure Java implementation of Cucumber that can integrates with all the
popular Dependency Injection containers.
== Dependencies
-For this examples we are adding two dependencies in the `pom.xml` dependencies
section. `cucumber-openejb-shade` for integration with Open EJB and
`cucumber-junit` and `cucumber-java` to use JUnit to execute cucumber
scenario(s).
+For this examples we are adding two dependencies in the `pom.xml` dependencies
section. `cucumber-jakarta-openejb` for integration with Open EJB and
`cucumber-junit` and `cucumber-java` to use JUnit to execute cucumber
scenario(s).
[source,xml]
----
- <!-- io.cucumber:cucumber-openejb:7.3.2 still uses
javax.ejb.embeddable.EJBContainer in OpenEJBObjectFactory.java -->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>cucumber-openejb-shade</artifactId>
- <version>9.0.0-M9-SNAPSHOT</version>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-jakarta-openejb</artifactId>
+ <version>7.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -35,13 +34,13 @@ For this examples we are adding two dependencies in the
`pom.xml` dependencies s
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
diff --git a/examples/cucumber-jvm/README_pt.adoc
b/examples/cucumber-jvm/README_pt.adoc
index 54da02cec2..f9884ac42c 100644
--- a/examples/cucumber-jvm/README_pt.adoc
+++ b/examples/cucumber-jvm/README_pt.adoc
@@ -14,15 +14,14 @@ Cucumber foi originalmente escrito na linguagem de
programação Ruby, mas agora
É a implementação Java pura de Cucumber que pode integrar com todos os
contêineres populares de injeção de dependência.
== Dependências
-Para este exemplo nós vamos adicionar duas dependências no `pom.xml` na sessão
dependências. `cucumber-openejb-shade` para integração com o Open EJB e
`cucumber-junit` e `cucumber-java` usar o JUnit para executar cenários de
cucumber.
+Para este exemplo nós vamos adicionar duas dependências no `pom.xml` na sessão
dependências. `cucumber-jakarta-openejb` para integração com o Open EJB e
`cucumber-junit` e `cucumber-java` usar o JUnit para executar cenários de
cucumber.
[source,xml]
----
- <!-- io.cucumber:cucumber-openejb:7.3.2 still uses
javax.ejb.embeddable.EJBContainer in OpenEJBObjectFactory.java -->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>cucumber-openejb-shade</artifactId>
- <version>9.0.0-M9-SNAPSHOT</version>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-jakarta-openejb</artifactId>
+ <version>7.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -34,13 +33,13 @@ Para este exemplo nós vamos adicionar duas dependências no
`pom.xml` na sessã
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
----
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index 88c8f38243..3d42af7740 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -69,11 +69,10 @@
<version>9.0.0-M9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <!-- io.cucumber:cucumber-openejb:7.3.2 still uses
javax.ejb.embeddable.EJBContainer in OpenEJBObjectFactory.java -->
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>cucumber-openejb-shade</artifactId>
- <version>9.0.0-M9-SNAPSHOT</version>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-jakarta-openejb</artifactId>
+ <version>7.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -85,13 +84,13 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>7.3.2</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
</dependencies>
