diff --git a/abbot/project.properties b/abbot/project.properties index 1ddc4a30..deaed100 100644 --- a/abbot/project.properties +++ b/abbot/project.properties @@ -14,11 +14,6 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.xdoc.date=left -maven.xdoc.version=${pom.currentVersion} -maven.license.licenseFile=${basedir}/../LICENSE.txt -maven.checkstyle.header.file = ${basedir}/../LICENSE.txt - maven.abbot.reports.dir = ${maven.build.dir} # WARNING: By default, do not run unit tests as they require a display @@ -26,9 +21,4 @@ maven.abbot.reports.dir = ${maven.build.dir} maven.test.skip = true # Have the abbot test reports appear in ${maven.abbot.reports.dir} -maven.junit.sysproperties = maven.abbot.reports.dir - -# Fork so that the plugin unit tests are run with the correct classpath -maven.junit.fork = true - - +maven.junit.sysproperties = maven.abbot.reports.dir \ No newline at end of file diff --git a/artifact/project.properties b/artifact/project.properties index 70b2868a..ad2ac251 100644 --- a/artifact/project.properties +++ b/artifact/project.properties @@ -18,5 +18,3 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/changelog/project.properties b/changelog/project.properties index 6a32f7ec..ad2ac251 100644 --- a/changelog/project.properties +++ b/changelog/project.properties @@ -17,7 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=true -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/changes/project.properties b/changes/project.properties index 26a38936..ad2ac251 100644 --- a/changes/project.properties +++ b/changes/project.properties @@ -17,4 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes + diff --git a/dist/project.properties b/dist/project.properties index 9550b11f..ad2ac251 100644 --- a/dist/project.properties +++ b/dist/project.properties @@ -17,5 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.jar.override=on -maven.jar.maven=${maven.home}/lib/maven.jar + diff --git a/ejb/project.properties b/ejb/project.properties index 3f66f915..ad2ac251 100644 --- a/ejb/project.properties +++ b/ejb/project.properties @@ -18,5 +18,3 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.jar.override=on -maven.jar.maven=${maven.home}/lib/maven.jar diff --git a/hibernate/project.properties b/hibernate/project.properties index 9ab613b9..d66f96c3 100644 --- a/hibernate/project.properties +++ b/hibernate/project.properties @@ -17,5 +17,3 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.docs.outputencoding=UTF-8 -maven.junit.fork=true \ No newline at end of file diff --git a/html2xdoc/project.properties b/html2xdoc/project.properties index 22100b79..d66f96c3 100644 --- a/html2xdoc/project.properties +++ b/html2xdoc/project.properties @@ -17,4 +17,3 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes \ No newline at end of file diff --git a/j2ee/project.properties b/j2ee/project.properties index 6bf1b087..5b5b0731 100644 --- a/j2ee/project.properties +++ b/j2ee/project.properties @@ -17,5 +17,5 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=true + diff --git a/javacc/project.properties b/javacc/project.properties index 26a38936..ad2ac251 100644 --- a/javacc/project.properties +++ b/javacc/project.properties @@ -17,4 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes + diff --git a/javadoc/project.properties b/javadoc/project.properties index 26a38936..ad2ac251 100644 --- a/javadoc/project.properties +++ b/javadoc/project.properties @@ -17,4 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes + diff --git a/jellydoc/project.properties b/jellydoc/project.properties index 3e927bce..b69bdd2f 100644 --- a/jellydoc/project.properties +++ b/jellydoc/project.properties @@ -18,7 +18,4 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -# vmassol: shouldn't this be deleted? -maven.activitylog.range = 30 -maven.jar.override=on maven.jar.javadoc=${tools.jar} \ No newline at end of file diff --git a/linkcheck/project.properties b/linkcheck/project.properties index 409659a1..6203dcbd 100644 --- a/linkcheck/project.properties +++ b/linkcheck/project.properties @@ -29,7 +29,4 @@ maven.junit.sysproperties = \ maven.linkcheck.proxy.ntlm.domain \ maven.mode.online -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar - log4j.logger.org.apache.maven.plugin.linkcheck=INFO \ No newline at end of file diff --git a/multiproject/project.properties b/multiproject/project.properties index 70b2868a..ad2ac251 100644 --- a/multiproject/project.properties +++ b/multiproject/project.properties @@ -18,5 +18,3 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/plugin-parent/project.properties b/plugin-parent/project.properties index fa48e513..01062546 100644 --- a/plugin-parent/project.properties +++ b/plugin-parent/project.properties @@ -88,6 +88,7 @@ maven.jar.maven = ${maven.home}/lib/maven.jar # We are targetting the 1.3 JVM and above maven.compile.target=1.3 maven.compile.source=1.3 +maven.compile.encoding=UTF-8 #===== # Announcement plugin properties @@ -122,6 +123,11 @@ maven.changes.issue.template = %URL%/%ISSUE% maven.checkstyle.header.file = ${basedir}/../plugin-parent/checkstyle-license.txt maven.checkstyle.properties = ${basedir}/../plugin-parent/checkstyle.xml +#===== +# Javadoc plugin settings +#===== +maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/ + #===== # License plugin settings #===== @@ -157,6 +163,12 @@ maven.site.stage.address=people.apache.org maven.site.stage.directory=/home/brett/public_html/maven-stage-site/${pom.siteDirectory.substring(22)} maven.site.deploy.method=rsync +#===== +# Test/JUnit plugin settings +#===== +# Fork so that plugins unit tests are run with the correct classpath +maven.junit.fork = true + #===== # XDOC plugin settings #===== @@ -167,4 +179,5 @@ maven.xdoc.distributionUrl=http://www.apache.org/dyn/closer.cgi/java-repository/ maven.xdoc.version = ${pom.currentVersion} # Use the maven site theme maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css -maven.xdoc.locale.default=en \ No newline at end of file +maven.xdoc.locale.default=en +maven.docs.outputencoding=UTF-8 \ No newline at end of file diff --git a/plugin/project.properties b/plugin/project.properties index 3a34b423..d66f96c3 100644 --- a/plugin/project.properties +++ b/plugin/project.properties @@ -17,4 +17,3 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=true \ No newline at end of file diff --git a/pom/project.properties b/pom/project.properties index 70b2868a..ad2ac251 100644 --- a/pom/project.properties +++ b/pom/project.properties @@ -18,5 +18,3 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/project.xml b/project.xml index d65b6ec1..1fb8282d 100644 --- a/project.xml +++ b/project.xml @@ -178,7 +178,6 @@ maven-changelog-plugin maven-changes-plugin - maven-dashboard-plugin maven-developer-activity-plugin maven-faq-plugin maven-file-activity-plugin diff --git a/release/project.properties b/release/project.properties index 4833d7d2..ad2ac251 100644 --- a/release/project.properties +++ b/release/project.properties @@ -17,7 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes -maven.jar.override = on -maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/simian/project.properties b/simian/project.properties index f9903556..ad802ac9 100644 --- a/simian/project.properties +++ b/simian/project.properties @@ -17,7 +17,5 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/ -maven.junit.fork=yes maven.simian.testexcludes = **/ExcludeMe.java maven.pmd.check.tests=false diff --git a/xdoc/project.properties b/xdoc/project.properties index 578b991f..ad2ac251 100644 --- a/xdoc/project.properties +++ b/xdoc/project.properties @@ -17,5 +17,4 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes -maven.compile.encoding=UTF-8 +