You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/04/19 17:07:27 UTC
svn commit: r1469877 - in /incubator/jspwiki/branches/MVN3_BRANCH:
jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
jspwiki-it-tests/jspwiki-selenium-tests/pom.xml jspwiki-it-tests/pom.xml
jspwiki-war/pom.xml pom.xml
Author: juanpablo
Date: Fri Apr 19 15:07:27 2013
New Revision: 1469877
URL: http://svn.apache.org/r1469877
Log:
JSPWIKI-771:
- <pluginManagement/> must go inside <build/>
- default maven plugins have been put into <pluginManagement/>, to make the build independent of the maven version used
- enforcer plugin execution
- JDK 6 required
- Maven 3.0 or greater required
- sonar support
- moved common configuration from modules to parent pom
- javadoc generates a class/package UML diagram if it founds graphviz binary (www.graphviz.org) on path
Modified:
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml?rev=1469877&r1=1469876&r2=1469877&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-it-vanilla/pom.xml Fri Apr 19 15:07:27 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -14,9 +15,8 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns = "http://maven.apache.org/POM/4.0.0"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<id>tomcat-run</id>
@@ -70,7 +69,6 @@
</goals>
<phase>pre-integration-test</phase>
<configuration>
- <port>8080</port>
<fork>true</fork>
</configuration>
</execution>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1469877&r1=1469876&r2=1469877&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Fri Apr 19 15:07:27 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -14,9 +15,8 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns = "http://maven.apache.org/POM/4.0.0"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -25,6 +25,7 @@
<groupId>org.apache.incubator.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
<version>2.9.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml<relativePath>
</parent>
<groupId>org.apache.incubator.jspwiki.it</groupId>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml?rev=1469877&r1=1469876&r2=1469877&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-it-tests/pom.xml Fri Apr 19 15:07:27 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -14,9 +15,8 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns = "http://maven.apache.org/POM/4.0.0"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml?rev=1469877&r1=1469876&r2=1469877&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Fri Apr 19 15:07:27 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns = "http://maven.apache.org/POM/4.0.0"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -29,12 +29,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jspwiki-war</artifactId>
- <name>Apache JSPWiki (Incubating)</name>
- <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
- and built around standard J2EE components (Java, servlets, JSP).</description>
- <url>http://incubator.apache.org/jspwiki/</url>
-
+ <name>Apache JSPWiki (Incubating) webapp</name>
<packaging>war</packaging>
+ <description>Apache JSPWiki (Incubating) is a leading open source WikiWiki engine, feature-rich
+ and built around standard J2EE components (Java, servlets, JSP).</description>
<dependencies>
<dependency>
@@ -249,7 +247,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
<configuration>
<server>myTomcat</server>
<url>http://localhost:8080/manager/text</url>
@@ -258,7 +255,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -333,9 +329,7 @@
All tests can be skipped via -Dmaven.test.skip
-->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
<configuration>
<excludes>
<!-- time-consuming tests excluded by default -->
@@ -356,7 +350,6 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.3.2</version>
<executions>
<execution>
<id>compressJSfiles</id>
@@ -364,9 +357,6 @@
<goal>compress</goal>
</goals>
<configuration>
- <nosuffix>true</nosuffix>
- <warSourceDirectory>${basedir}/src/webdocs</warSourceDirectory>
- <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
<!-- Lots of warnings (300+) as YUICompressor is unhappy with our JS files -->
<!--jswarn>false</jswarn-->
<includes>
@@ -391,9 +381,6 @@
<goal>compress</goal>
</goals>
<configuration>
- <nosuffix>true</nosuffix>
- <warSourceDirectory>${basedir}/src/webdocs</warSourceDirectory>
- <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
<linebreakpos>0</linebreakpos>
<includes>
<include>templates/default/jspwiki.css</include>
@@ -409,10 +396,8 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
<configuration>
<webXml>etc/web.xml</webXml>
- <archiveClasses>true</archiveClasses>
<webResources>
<resource>
<directory>etc</directory>
Modified: incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/pom.xml?rev=1469877&r1=1469876&r2=1469877&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/pom.xml Fri Apr 19 15:07:27 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -14,9 +15,8 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns = "http://maven.apache.org/POM/4.0.0"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -24,69 +24,292 @@
<groupId>org.apache.incubator.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
- <name>jspwiki-builder</name>
+ <name>Apache JSPWiki (incubating)</name>
<version>2.9.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard J2EE components (Java, servlets, JSP).</description>
<url>http://incubator.apache.org/jspwiki/</url>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jdk.version>1.6</jdk.version>
</properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jspwiki/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jspwiki/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/jspwiki/trunk</url>
+ </scm>
+
<modules>
<module>jspwiki-war</module>
<!-- <module>jspwiki-it-tests</module> --><!-- don't launch the IT tests as part of the main build -->
</modules>
- <pluginManagement> <!-- defines what configuration is going to be used if and only if the plugin is used -->
- <plugins>
+ <build>
+ <plugins> <!-- plugins executed with every build -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
-
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.7,)</versionRange>
- <goals><goal>run</goal></goals>
- </pluginExecutionFilter>
- <action><ignore></ignore></action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <versionRange>[1.3.2,)</versionRange>
- <goals><goal>compress</goal></goals>
- </pluginExecutionFilter>
- <action><ignore></ignore></action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforcer-validations</id>
+ <goals><goal>enforce</goal></goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
- </pluginManagement>
+
+ <pluginManagement> <!-- defines what configuration is going to be used if and only if the plugin is used -->
+ <plugins> <!-- ordered alphabetically by groupId (default first):artifactId -->
+ <plugin> <!-- default maven plugins have their version configured to make the build independent of the maven version used -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <fail>true</fail>
+ <rules>
+ <requireJavaVersion>
+ <message>MUST USE JDK 1.6</message>
+ <version>${jdk.version}</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <message>BUILD REQUIRES MAVEN 3</message>
+ <version>[3.0,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}</Extension-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <additionalparam>
+ -charset ${project.build.sourceEncoding}
+ -docencoding ${project.build.sourceEncoding}
+ -version
+ -author
+ -breakiterator
+ -linksource
+ -sourcetab 4
+ -windowtitle "${project.name} ${project.version}"
+ -bottom ""
+ -doctitle "${project.name} ${project.version}"
+ -link {project.organization.url}
+ </additionalparam>
+ <bottom>Copyright © {inceptionYear}-{currentYear} ${project.organization.name}. All rights reserved.</bottom>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.3.1.GA</version>
+ </docletArtifact>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.14.1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}</Extension-Name>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Specification-Version>${project.version}</Specification-Version>
+ </manifestEntries>
+ </archive>
+ <archiveClasses>true</archiveClasses>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <configuration>
+ <nosuffix>true</nosuffix>
+ <warSourceDirectory>${project.basedir}/src/webdocs</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <contextReloadable>true</contextReloadable>
+ <port>8080</port>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>net.sourceforge.cobertura.datafile</name>
+ <value>${maven.build.dir}/cobertura/cobertura.ser</value>
+ </property>
+ <property>
+ <name>cobertura.use.java.nio</name>
+ <value>false</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <background>true</background>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.sonar-plugins</groupId>
+ <artifactId>maven-report</artifactId>
+ <version>0.1</version>
+ </plugin>
+
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals><goal>run</goal></goals>
+ </pluginExecutionFilter>
+ <action><ignore></ignore></action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <versionRange>[1.3.2,)</versionRange>
+ <goals><goal>compress</goal></goals>
+ </pluginExecutionFilter>
+ <action><ignore></ignore></action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
</project>
\ No newline at end of file