You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2016/01/11 19:49:23 UTC
falcon git commit: FALCON-1730 Upgrade enunciate for JDK 8
compatibility. Contributed by Deepak Barr.
Repository: falcon
Updated Branches:
refs/heads/0.9 25347c0e0 -> ceb4ca875
FALCON-1730 Upgrade enunciate for JDK 8 compatibility. Contributed by Deepak Barr.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/ceb4ca87
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ceb4ca87
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ceb4ca87
Branch: refs/heads/0.9
Commit: ceb4ca875e77a5c59f5235da4c05f59ef614765c
Parents: 25347c0
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Jan 12 00:08:49 2016 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Tue Jan 12 00:19:03 2016 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pom.xml | 13 +++----------
prism/enunciate.xml | 26 +++++++++++---------------
prism/pom.xml | 8 +++++---
4 files changed, 21 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/ceb4ca87/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 183acc5..02c7bfb 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -96,6 +96,8 @@ Proposed Release Version: 0.9
OPTIMIZATIONS
BUG FIXES
+ FALCON-1730 Upgrade enunciate for JDK 8 compatibility(Deepak Barr via Ajay Yadava)
+
FALCON-1741 Rerun API behaviour different in case of succeeded instances(Pallavi Rao via Ajay Yadava)
FALCON-1735 FalconException shouldn't be caught in AbstractRerunHandler in case of obtaining Workflow engine from entity(Pavan Kumar Kolamuri via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/ceb4ca87/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1bd7363..2f851b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1411,16 +1411,9 @@
</plugin>
<plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <version>1.30.1</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>enunciate-rt</artifactId>
- <version>1.30.1</version>
- </dependency>
- </dependencies>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <version>2.1.1</version>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/falcon/blob/ceb4ca87/prism/enunciate.xml
----------------------------------------------------------------------
diff --git a/prism/enunciate.xml b/prism/enunciate.xml
index efa4708..4d4b6d0 100644
--- a/prism/enunciate.xml
+++ b/prism/enunciate.xml
@@ -16,27 +16,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<enunciate label="falcon" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.25.xsd">
+<enunciate slug="falcon" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0-M.4.xsd">
<namespaces>
<namespace uri="https://git-wip-us.apache.org/repos/asf/falcon.git" id="falcon"/>
</namespaces>
- <services>
- <rest defaultRestSubcontext="/api" >
- <custom-resource-parameter-annotation qualifiedName="org.glassfish.jersey.media.multipart.FormDataParam"/>
- </rest>
- <api-import pattern="org.apache.falcon.resource.admin.AdminResource" />
- <api-import pattern="org.apache.falcon.resource.proxy.InstanceManagerProxy" />
- <api-import pattern="org.apache.falcon.resource.proxy.SchedulableEntityManagerProxy" />
- <api-import pattern="org.apache.falcon.resource.metadata.LineageMetadataResource" />
- <api-import pattern="org.apache.falcon.resource.metadata.MetadataDiscoveryResource" />
- </services>
-
<modules>
- <docs docsDir="docs" title="Falcon Server REST API"/>
+ <api-classes>
+ <include pattern="org.apache.falcon.resource.admin.AdminResource" />
+ <include pattern="org.apache.falcon.resource.proxy.InstanceManagerProxy" />
+ <include pattern="org.apache.falcon.resource.proxy.SchedulableEntityManagerProxy" />
+ <include pattern="org.apache.falcon.resource.metadata.LineageMetadataResource" />
+ <include pattern="org.apache.falcon.resource.metadata.MetadataDiscoveryResource" />
+ </api-classes>
+ <docs/>
<csharp disabled="true"/>
<c disabled="true"/>
<obj-c disabled="true"></obj-c>
+ <java-json-client disabled="true"/>
</modules>
</enunciate>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/falcon/blob/ceb4ca87/prism/pom.xml
----------------------------------------------------------------------
diff --git a/prism/pom.xml b/prism/pom.xml
index e66774c..35b43bc 100644
--- a/prism/pom.xml
+++ b/prism/pom.xml
@@ -265,15 +265,17 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <version>1.30.1</version>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<goals>
<goal>docs</goal>
</goals>
<configuration>
+ <source>1.7</source>
+ <target>1.7</target>
<configFile>enunciate.xml</configFile>
<!-- the directory where to put the docs -->
<docsDir>${project.build.directory}/restapi/docs</docsDir>