You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/05/18 15:52:07 UTC
svn commit: r1795542 - in /commons/proper/jelly/trunk:
jelly-tags/tag-checkstyle.xml pom.xml src/site/ src/site/resources/
src/site/resources/profile.clirr src/site/resources/profile.jacoco
Author: britter
Date: Thu May 18 15:52:07 2017
New Revision: 1795542
URL: http://svn.apache.org/viewvc?rev=1795542&view=rev
Log:
Fix failing site build: adapt maven configuration from Commons Lang
Added:
commons/proper/jelly/trunk/src/site/
commons/proper/jelly/trunk/src/site/resources/
commons/proper/jelly/trunk/src/site/resources/profile.clirr
commons/proper/jelly/trunk/src/site/resources/profile.jacoco
Modified:
commons/proper/jelly/trunk/jelly-tags/tag-checkstyle.xml
commons/proper/jelly/trunk/pom.xml
Modified: commons/proper/jelly/trunk/jelly-tags/tag-checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/tag-checkstyle.xml?rev=1795542&r1=1795541&r2=1795542&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/tag-checkstyle.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/tag-checkstyle.xml Thu May 18 15:52:07 2017
@@ -23,23 +23,23 @@ limitations under the License.
<!-- commons lang customization of default Checkstyle behavior -->
<module name="Checker">
<property name="localeLanguage" value="en"/>
- <module name="PackageHtml"/>
+ <module name="JavadocPackage">
+ <!-- setting allowLegacy means it will check for package.html instead of just package-info.java -->
+ <property name="allowLegacy" value="true"/>
+ </module>
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java,xml"/>
+ </module>
<module name="TreeWalker">
- <module name="TabCharacter"/>
+ <property name="cacheFile" value="target/cachefile"/>
<module name="AvoidStarImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="NeedBraces"/>
- <module name="RedundantThrows">
- <property name="allowUnchecked" value="true"/>
- </module>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
<module name="JavadocMethod">
<property name="allowUndeclaredRTE" value="true"/>
+ <property name="scope" value="public" />
</module>
- </module>
+ <module name="UpperEll" />
+ </module>
</module>
-
-
Modified: commons/proper/jelly/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/pom.xml?rev=1795542&r1=1795541&r2=1795542&view=diff
==============================================================================
--- commons/proper/jelly/trunk/pom.xml (original)
+++ commons/proper/jelly/trunk/pom.xml Thu May 18 15:52:07 2017
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>35</version>
+ <version>42</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-jelly</groupId>
@@ -32,6 +32,36 @@
<archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
</mailingList>
</mailingLists>
+
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <!--
+ This is also used to generate download_xxx file name.
+ To override this when generating the download page:
+ mvn commons:download-page -Dcommons.componentid=lang
+ The above seems to change the download page name but not any other
+ properties that depend on the componentid.
+ -->
+ <commons.componentid>jelly</commons.componentid>
+ <!-- Current 3.x release series -->
+ <commons.release.version>1.1</commons.release.version>
+ <commons.release.desc>(Java 7.0+)</commons.release.desc>
+ <commons.jira.id>JELLY</commons.jira.id>
+ <commons.jira.pid>10012</commons.jira.pid>
+
+ <commons.site.path>jelly</commons.site.path>
+ <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-jelly</commons.scmPubUrl>
+ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+ <commons.encoding>utf-8</commons.encoding>
+
+ <!-- Override clirr version to be able to build the site on Java 8 -->
+ <commons.clirr.version>2.8</commons.clirr.version>
+ <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+ </properties>
+
<developers>
<developer>
<id>jstrachan</id>
@@ -426,7 +456,7 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1-beta-8</version>
+ <version>1.1.6</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -461,17 +491,27 @@
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
<artifactId>maven-jellydoc-plugin</artifactId>
+ <version>1.4</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
+ <!-- Plugin doesn't work with maven 3
<plugin>
+ <groupId>maven</groupId>
<artifactId>maven-multichanges-plugin</artifactId>
+ <version>1.3</version>
</plugin>
+ -->
+ <!-- Plugin doesn't work with maven 3
<plugin>
+ <groupId>maven</groupId>
<artifactId>maven-multiproject-plugin</artifactId>
+ <version>1.5.1</version>
</plugin>
+ -->
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
@@ -484,4 +524,24 @@
</plugin>
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>deactivate-javadoc-lint</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
</project>
Added: commons/proper/jelly/trunk/src/site/resources/profile.clirr
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/site/resources/profile.clirr?rev=1795542&view=auto
==============================================================================
(empty)
Added: commons/proper/jelly/trunk/src/site/resources/profile.jacoco
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/site/resources/profile.jacoco?rev=1795542&view=auto
==============================================================================
(empty)