You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2015/09/11 07:31:38 UTC

incubator-atlas git commit: ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master e77d3d336 -> 367f5f8ee


ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/367f5f8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/367f5f8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/367f5f8e

Branch: refs/heads/master
Commit: 367f5f8ee73bf0c64dd849683c9ce908bade9775
Parents: e77d3d3
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Fri Sep 11 11:01:37 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Fri Sep 11 11:01:37 2015 +0530

----------------------------------------------------------------------
 pom.xml         | 10 ++++++++++
 release-log.txt |  1 +
 webapp/pom.xml  |  5 +++++
 3 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/367f5f8e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 915df4b..7e3df4d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -474,9 +474,19 @@
                         <groupId>javax.servlet</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish</groupId>
+                        <artifactId>javax.el</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.el</artifactId>
+                <version>3.0.0</version>
+            </dependency>
+
             <!-- Logging -->
             <dependency>
                 <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/367f5f8e/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index a255f0b..e2e5557 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)
 ATLAS-117 Build fails on the latest commit (dossett@gmail.com via shwethags)
 ATLAS-115 Remove unnecessary log4j.xml in typesystem (jmaron)
 ATLAS-67 add zk service principal for secure tests (jmaron)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/367f5f8e/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 65c7bde..e4f355e 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -205,6 +205,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
         </dependency>