Removed Javadoc plugin from root module and moved it to api module in an effort to make build faster and try to solve issue with package generation. Doesn't seem to work, though :(
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/efb63e4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/efb63e4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/efb63e4c Branch: refs/heads/master Commit: efb63e4c4df76b5433f2b36b3800d481992f8d73 Parents: 3096e87 Author: Chris Laprun <[email protected]> Authored: Fri Nov 20 14:51:17 2015 +0100 Committer: Chris Laprun <[email protected]> Committed: Fri Nov 20 14:51:17 2015 +0100 ---------------------------------------------------------------------- api/pom.xml | 38 ++++++++++++++++++++++ pom.xml | 96 +++++++++++++++++++------------------------------------ rest/pom.xml | 39 ++++++++++++++++++++++ 3 files changed, 109 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/efb63e4c/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index e12dbfb..7b31fe9 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -29,4 +29,42 @@ <description>Main API of the Apache Unomi Context server</description> <packaging>bundle</packaging> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <configuration> + <tags> + <tag> + <name>summary</name> + <placement>a</placement> + <head>MireDot summary (resource title)</head> + </tag> + <tag> + <name>title</name> + <placement>a</placement> + <head>MireDot title (resource title)</head> + </tag> + <tag> + <name>servicetag</name> + <placement>a</placement> + <head>MireDot resource tag (label)</head> + </tag> + <tag> + <name>statuscode</name> + <placement>a</placement> + <head>MireDot resource status code(s)</head> + </tag> + <tag> + <name>responseheader</name> + <placement>a</placement> + <head>MireDot response header</head> + </tag> + </tags> + </configuration> + </plugin> + </plugins> + </reporting> </project> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/efb63e4c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3404382..cfde31d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,9 @@ <groupId>org.apache.unomi</groupId> <artifactId>unomi-root</artifactId> <name>Apache Unomi :: Root Project</name> - <description>Unomi is a reference implementation of the OASIS Context Server specification currently being worked on by the OASIS Context Server Technical Committee. It provides a high-performance user profile and event tracking server.</description> + <description>Unomi is a reference implementation of the OASIS Context Server specification currently being worked on by the OASIS Context Server Technical Committee. It + provides a high-performance user profile and event tracking server. + </description> <url>http://unomi.incubator.apache.org</url> <version>2.0.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> @@ -58,7 +60,7 @@ <version.jackson.jaxb>2.4.0</version.jackson.jaxb> <!-- version used by CXF --> <version.karaf>3.0.2</version.karaf> <version.pax.exam>4.4.0</version.pax.exam> - <jahia.plugin.version>4.3</jahia.plugin.version> + <jahia.plugin.version>4.3</jahia.plugin.version> </properties> <mailingLists> @@ -89,7 +91,7 @@ <connection>scm:git:[email protected]:Jahia/unomi.git</connection> <url>https://github.com/Jahia/unomi</url> <developerConnection>scm:git:[email protected]:Jahia/unomi.git</developerConnection> - <tag>HEAD</tag> + <tag>HEAD</tag> </scm> <developers> @@ -302,32 +304,32 @@ <checkstyleRules> <module name="Checker"> <module name="TreeWalker"> - <module name="JavadocType" /> + <module name="JavadocType"/> <module name="JavadocMethod"> - <property name="scope" value="public" /> - <property name="allowMissingPropertyJavadoc" value="true" /> + <property name="scope" value="public"/> + <property name="allowMissingPropertyJavadoc" value="true"/> </module> - <module name="UnusedImports" /> + <module name="UnusedImports"/> <module name="ConstantName"> - <property name="applyToProtected" value="false" /> - <property name="applyToPackage" value="false" /> - <property name="applyToPrivate" value="false" /> + <property name="applyToProtected" value="false"/> + <property name="applyToPackage" value="false"/> + <property name="applyToPrivate" value="false"/> </module> <module name="EmptyBlock"> - <property name="option" value="text" /> + <property name="option" value="text"/> </module> - <module name="NeedBraces" /> - <module name="EqualsHashCode" /> + <module name="NeedBraces"/> + <module name="EqualsHashCode"/> <module name="MagicNumber"> - <property name="ignoreNumbers" value=" -1, 0, 1, 2, 3, 17, 24, 31, 37, 60, 255, 256, 1000" /> + <property name="ignoreNumbers" value=" -1, 0, 1, 2, 3, 17, 24, 31, 37, 60, 255, 256, 1000"/> </module> - <module name="SimplifyBooleanReturn" /> + <module name="SimplifyBooleanReturn"/> <module name="IllegalCatch"> - <property name="illegalClassNames" value=" java.lang.Throwable" /> + <property name="illegalClassNames" value=" java.lang.Throwable"/> </module> - <module name="MultipleVariableDeclarations" /> - <module name="OneStatementPerLine" /> - <module name="RedundantModifier" /> + <module name="MultipleVariableDeclarations"/> + <module name="OneStatementPerLine"/> + <module name="RedundantModifier"/> </module> </module> </checkstyleRules> @@ -535,17 +537,17 @@ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> </instructions> </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <preparationGoals>clean install</preparationGoals> - <releaseProfiles>integration-tests,performance-tests,generate-package</releaseProfiles> - </configuration> - </plugin> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.3</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <preparationGoals>clean install</preparationGoals> + <releaseProfiles>integration-tests,performance-tests,generate-package</releaseProfiles> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -640,40 +642,6 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.8.1</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <configuration> - <tags> - <tag> - <name>summary</name> - <placement>a</placement> - <head>MireDot summary (resource title)</head> - </tag> - <tag> - <name>title</name> - <placement>a</placement> - <head>MireDot title (resource title)</head> - </tag> - <tag> - <name>servicetag</name> - <placement>a</placement> - <head>MireDot resource tag (label)</head> - </tag> - <tag> - <name>statuscode</name> - <placement>a</placement> - <head>MireDot resource status code(s)</head> - </tag> - <tag> - <name>responseheader</name> - <placement>a</placement> - <head>MireDot response header</head> - </tag> - </tags> - </configuration> - </plugin> </plugins> </reporting> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/efb63e4c/rest/pom.xml ---------------------------------------------------------------------- diff --git a/rest/pom.xml b/rest/pom.xml index 8bf67c8..3ec17d8 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -228,4 +228,43 @@ </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <configuration> + <tags> + <tag> + <name>summary</name> + <placement>a</placement> + <head>MireDot summary (resource title)</head> + </tag> + <tag> + <name>title</name> + <placement>a</placement> + <head>MireDot title (resource title)</head> + </tag> + <tag> + <name>servicetag</name> + <placement>a</placement> + <head>MireDot resource tag (label)</head> + </tag> + <tag> + <name>statuscode</name> + <placement>a</placement> + <head>MireDot resource status code(s)</head> + </tag> + <tag> + <name>responseheader</name> + <placement>a</placement> + <head>MireDot response header</head> + </tag> + </tags> + </configuration> + </plugin> + </plugins> + </reporting> + </project>
