This is an automated email from the ASF dual-hosted git repository.

weimer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/reef.git


The following commit(s) were added to refs/heads/master by this push:
     new e2c4712  [REEF-2056] Fix dependency conflict issue
e2c4712 is described below

commit e2c47121cde21108a602c560cf76565a40d0e916
Author: HelloCoCooo <[email protected]>
AuthorDate: Wed Apr 24 04:32:22 2019 +0800

    [REEF-2056] Fix dependency conflict issue
    
      * Update the dependency on `org.ow2.asm` to version 5.3
      * Manage the dependency in the root pom.
    
    JIRA:
      [REEF-2056](https://issues.apache.org/jira/browse/REEF-2056)
    
    Pull Request:
      This closes #1489
---
 lang/java/reef-applications/reef-vortex/pom.xml |  4 ++++
 pom.xml                                         | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lang/java/reef-applications/reef-vortex/pom.xml 
b/lang/java/reef-applications/reef-vortex/pom.xml
index d75bd3e..85792d8 100644
--- a/lang/java/reef-applications/reef-vortex/pom.xml
+++ b/lang/java/reef-applications/reef-vortex/pom.xml
@@ -60,6 +60,10 @@ under the License.
             <artifactId>kryo-serializers</artifactId>
             <version>${kryo-serializers.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 7134e16..bd3f34a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@ under the License.
         <!-- do not move beyond this version since it adds an incompatible 
guava dependency -->
         <xolstice.version>0.5.0</xolstice.version>
         <commons-codec.version>1.9</commons-codec.version>
+        <asm.version>5.0.3</asm.version>
         <rootPath>${user.dir}</rootPath>
     </properties>
 
@@ -795,7 +796,14 @@ under the License.
                 <artifactId>azure-batch</artifactId>
                 <version>3.0.0</version>
             </dependency>
-        </dependencies>
+                 
+            <!-- asm -->
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+                </dependency>       
+            </dependencies>
     </dependencyManagement>
 
     <modules>

Reply via email to