LENS-952: Bump up enunciate version to work with java 8
Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/be839122 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/be839122 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/be839122 Branch: refs/heads/master Commit: be839122d897eb1c739facd77d8c7ff086ab97d6 Parents: 466cee3 Author: Deepak Barr <[email protected]> Authored: Wed Aug 24 15:51:11 2016 +0800 Committer: raju <[email protected]> Committed: Wed Aug 24 15:52:41 2016 +0800 ---------------------------------------------------------------------- lens-server/enunciate.xml | 14 +++++-------- lens-server/pom.xml | 45 ++++++++++++++++-------------------------- pom.xml | 26 ++++++++---------------- 3 files changed, 30 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/lens-server/enunciate.xml ---------------------------------------------------------------------- diff --git a/lens-server/enunciate.xml b/lens-server/enunciate.xml index 7013f13..36b68d1 100644 --- a/lens-server/enunciate.xml +++ b/lens-server/enunciate.xml @@ -19,16 +19,12 @@ under the License. --> -<enunciate label="lens" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.25.xsd";> +<enunciate slug="lens" 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/lens.git"; id="lens"/> </namespaces> - <services> - <rest defaultRestSubcontext="/"> - <custom-resource-parameter-annotation qualifiedName="org.glassfish.jersey.media.multipart.FormDataParam"/> - </rest> - </services> + <modules> <api-classes> <include pattern="org.apache.lens.server.query.*"/> <include pattern="org.apache.lens.server.query.save.*"/> @@ -37,10 +33,10 @@ <include pattern="org.apache.lens.server.scheduler.*"/> <include pattern="org.apache.lens.server.session.*"/> </api-classes> - <modules> - <docs docsDir="lens-server" title="Lens Server REST API"/> + <docs docsDir="target/enunciate/lens-server"/> <csharp disabled="true"/> <c disabled="true"/> <obj-c disabled="true"></obj-c> + <java-json-client disabled="true"/> </modules> </enunciate> http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/lens-server/pom.xml ---------------------------------------------------------------------- diff --git a/lens-server/pom.xml b/lens-server/pom.xml index 29098d4..4ee514b 100644 --- a/lens-server/pom.xml +++ b/lens-server/pom.xml @@ -391,33 +391,22 @@ </execution> </executions> </plugin> + <plugin> + <groupId>com.webcohesion.enunciate</groupId> + <artifactId>enunciate-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>docs</goal> + </goals> + </execution> + </executions> + <configuration> + <source>1.7</source> + <target>1.7</target> + <configFile>enunciate.xml</configFile> + </configuration> + </plugin> </plugins> </build> - - <profiles> - <profile> - <id>enunciate</id> - <activation> - <jdk>[1.7,1.8)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.enunciate</groupId> - <artifactId>maven-enunciate-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>docs</goal> - </goals> - </execution> - </executions> - <configuration> - <configFile>enunciate.xml</configFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c181a58..0a898cd 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ <jaxb2.basics.plugin.version>0.9.5</jaxb2.basics.plugin.version> <jaxb2.fluent.plugin.version>3.0</jaxb2.fluent.plugin.version> <exec.plugin.version>1.2.1</exec.plugin.version> - <enunciate.plugin.version>1.28</enunciate.plugin.version> + <enunciate.plugin.version>2.5.0</enunciate.plugin.version> <reports.plugin.version>2.7</reports.plugin.version> <javadoc.plugin.version>2.10.3</javadoc.plugin.version> <surefire.plugin.version>2.15</surefire.plugin.version> @@ -556,8 +556,8 @@ <version>${exec.plugin.version}</version> </plugin> <plugin> - <groupId>org.codehaus.enunciate</groupId> - <artifactId>maven-enunciate-plugin</artifactId> + <groupId>com.webcohesion.enunciate</groupId> + <artifactId>enunciate-maven-plugin</artifactId> <version>${enunciate.plugin.version}</version> </plugin> <plugin> @@ -749,6 +749,11 @@ </execution> </executions> </plugin> + <plugin> + <groupId>com.webcohesion.enunciate</groupId> + <artifactId>enunciate-maven-plugin</artifactId> + <version>${enunciate.plugin.version}</version> + </plugin> </plugins> </build> <repositories> @@ -1860,21 +1865,6 @@ </build> </profile> <profile> - <id>enunciate</id> - <activation> - <jdk>[1.7,1.8)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.enunciate</groupId> - <artifactId>maven-enunciate-plugin</artifactId> - <version>${enunciate.plugin.version}</version> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dev</id> <properties> <skipCheck>true</skipCheck>
