Merge branch '0.11' of https://github.com/apache/falcon into 0.11
diff --git a/NOTICE.txt b/NOTICE.txt
index 7521153..6daed5a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,6 +5,10 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product includes JMS specifications (https://javaee.github.io/jms-spec/)
+ which is distributed under the Common Development and Distribution License
+ (https://javaee.github.io/jms-spec/LICENSE)
+
*****************
CC BY-SA 3.0
*****************
diff --git a/common/pom.xml b/common/pom.xml
index 3f03fe2..95de7c1 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -265,7 +265,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.2</version>
<configuration>
<excludes>
<exclude>**/log4j.xml</exclude>
diff --git a/prism/pom.xml b/prism/pom.xml
index a20d03a..5766a43 100644
--- a/prism/pom.xml
+++ b/prism/pom.xml
@@ -295,7 +295,14 @@
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.6.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<goals>
