From c375b0d5f46f1fee05f8445c0ae6309efe7a3e71 Mon Sep 17 00:00:00 2001
From: jianglai <jianglai@google.com>
Date: Sat, 27 Oct 2018 15:21:53 -0700
Subject: [PATCH] Add javax.activation as a dependency of jaxb

In Java 9+, this module is no longer loaded by default. JAXB needs it to compile.

Also changed the root project name to "nomulus".

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219000053
---
 gradle/core/build.gradle | 1 +
 gradle/settings.gradle   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle
index 7a62e7728..c9745215c 100644
--- a/gradle/core/build.gradle
+++ b/gradle/core/build.gradle
@@ -206,6 +206,7 @@ dependencies {
   // Use jaxb 2.2.11 because 2.3 is known to break the Ant task we use.
   // TODO: upgrade jaxb versions to 2.4.0, already in beta by Sept 2018
   jaxb 'javax.xml.bind:jaxb-api:2.2.11'
+  jaxb 'com.sun.activation:javax.activation:1.2.0'
   jaxb 'com.sun.xml.bind:jaxb-xjc:2.2.11'
   jaxb 'com.sun.xml.bind:jaxb-impl:2.2.11'
   jaxb 'com.sun.xml.bind:jaxb-osgi:2.2.11'
diff --git a/gradle/settings.gradle b/gradle/settings.gradle
index ac57b8028..3a9c6015f 100644
--- a/gradle/settings.gradle
+++ b/gradle/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'gradle'
+rootProject.name = 'nomulus'
 
 include 'third_party'
 include 'core'