Re: [camel] branch master updated: fix the failing camel-ejb tests on the ci-server

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: [camel] branch master updated: fix the failing camel-ejb tests on the ci-server

Onder SEZGIN
locally, i did (to avoid any effect on others)

diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index 67936fa31d6..b26e7a8e3fe 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -54,8 +54,18 @@
               <groupId>org.slf4j</groupId>
               <artifactId>slf4j-jdk14</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-asm5-shaded</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
+        <!--
https://mvnrepository.com/artifact/org.apache.xbean/xbean-asm5-shaded -->
+        <dependency>
+          <groupId>org.apache.xbean</groupId>
+          <artifactId>xbean-asm5-shaded</artifactId>
+          <version>4.4</version>
+        </dependency>
         <dependency>
           <groupId>org.apache.camel</groupId>
           <artifactId>camel-test-spring</artifactId>


On Thu, May 10, 2018 at 1:35 PM, <[hidden email]> wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> bvahdat pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/camel.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>      new 8694112  fix the failing camel-ejb tests on the ci-server
> 8694112 is described below
>
> commit 869411288909580e792a6fb0216b7700f9b68b51
> Author: Babak Vahdat <[hidden email]>
> AuthorDate: Thu May 10 12:35:33 2018 +0200
>
>     fix the failing camel-ejb tests on the ci-server
> ---
>  components/camel-ejb/pom.xml | 8 ++++++++
>  parent/pom.xml               | 1 +
>  2 files changed, 9 insertions(+)
>
> diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
> index 67936fa..2613f98 100644
> --- a/components/camel-ejb/pom.xml
> +++ b/components/camel-ejb/pom.xml
> @@ -60,6 +60,14 @@
>            <groupId>org.apache.camel</groupId>
>            <artifactId>camel-test-spring</artifactId>
>            <scope>test</scope>
> +        </dependency>
> +        <!-- relying on the xbean-asm5-shaded version (currently 4.2)
> transitively through -->
> +        <!-- the 'org.apache.openejb:openejb-core' dependency would
> cause the tests to fail -->
> +        <dependency>
> +          <groupId>org.apache.xbean</groupId>
> +          <artifactId>xbean-asm5-shaded</artifactId>
> +          <version>${xbean-asm5-shaded-version}</version>
> +          <scope>test</scope>
>          </dependency>
>          <dependency>
>            <groupId>org.apache.logging.log4j</groupId>
> diff --git a/parent/pom.xml b/parent/pom.xml
> index 0796190..080daea 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -715,6 +715,7 @@
>      <xbean-spring-version>4.5</xbean-spring-version>
>      <!-- xbean-asm4-bundle is used by openjpa -->
>      <xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
> +    <xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
>      <xchange-version>4.3.4</xchange-version>
>      <xerces-bundle-version>2.11.0_1</xerces-bundle-version>
>      <xerces-version>2.11.0</xerces-version>
>
> --
> To stop receiving notification emails like this one, please contact
> [hidden email].
>