You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2019/10/23 00:25:50 UTC

[airavata] branch develop updated: Add javax.annotation and JAXB API as external dependencies to reslove compilation failures when migrating from Java 8 to 11

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

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new b90f17c  Add javax.annotation and JAXB API as external dependencies to reslove compilation failures when migrating from Java 8 to 11
     new 4784822  Merge pull request #234 from isururanawaka/Java_11_migration
b90f17c is described below

commit b90f17c05b73554515cff825b0471ab485a51f17
Author: isururanawaka <ir...@gmail.com>
AuthorDate: Tue Oct 22 17:05:03 2019 -0400

    Add javax.annotation and JAXB API as external dependencies to reslove compilation failures when migrating from Java 8 to 11
---
 airavata-api/airavata-base-api/pom.xml    | 5 +++++
 airavata-api/airavata-data-models/pom.xml | 6 +++++-
 modules/commons/pom.xml                   | 5 +++++
 pom.xml                                   | 2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/airavata-api/airavata-base-api/pom.xml b/airavata-api/airavata-base-api/pom.xml
index 2866951..18a3188 100644
--- a/airavata-api/airavata-base-api/pom.xml
+++ b/airavata-api/airavata-base-api/pom.xml
@@ -18,5 +18,10 @@
             <artifactId>libthrift</artifactId>
             <version>${thrift.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index ca8193a..5b5f61c 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -43,7 +43,11 @@
             <artifactId>libthrift</artifactId>
             <version>${thrift.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation.version}</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 68fedfc..138bf66 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -158,6 +158,11 @@
             <artifactId>airavata-base-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/pom.xml b/pom.xml
index c5b2f10..6830ab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,8 @@
         <google.guava.version>20.0</google.guava.version>
         <jacoco.version>0.8.1</jacoco.version>
         <openjpa.version>2.4.3</openjpa.version>
+        <javax.annotation.version>1.3.2</javax.annotation.version>
+        <jaxb.version>2.4.0-b180830.0359</jaxb.version>
     </properties>
 
     <developers>