svn commit: r695154 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
Author: dennisl Date: Sun Sep 14 02:17:39 2008 New Revision: 695154 URL: http://svn.apache.org/viewvc?rev=695154&view=rev Log: o Use the correct language code for the Chinese localization. Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=695154&r1=695153&r2=695154&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Sun Sep 14 02:17:39 2008 @@ -36,7 +36,7 @@ maven-site-plugin @pom.version@ - en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh + en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN
svn commit: r695160 - in /maven/plugin-tools/trunk: maven-plugin-tools-ant/src/site/apt/ maven-plugin-tools-api/src/site/apt/ maven-plugin-tools-beanshell/src/site/apt/ maven-plugin-tools-java/src/sit
Author: bentmann
Date: Sun Sep 14 02:28:08 2008
New Revision: 695160
URL: http://svn.apache.org/viewvc?rev=695160&view=rev
Log:
o Polished site
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-ant/src/site/apt/index.apt
maven/plugin-tools/trunk/maven-plugin-tools-api/src/site/apt/index.apt
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/site/apt/index.apt
maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/site/apt/index.apt
maven/plugin-tools/trunk/maven-plugin-tools-model/src/site/apt/index.apt
maven/plugin-tools/trunk/src/site/apt/index.apt
Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/src/site/apt/index.apt?rev=695160&r1=695159&r2=695160&view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-ant/src/site/apt/index.apt
(original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-ant/src/site/apt/index.apt Sun
Sep 14 02:28:08 2008
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Introduction
+Maven Plugin Tool for Ant
The Maven Plugin Tool for Ant is the Ant impl of
{{{../maven-plugin-tools-api/index.html}maven-plugin-tools-api}} to
extract descriptors for plugins written in Ant.
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/site/apt/index.apt?rev=695160&r1=695159&r2=695160&view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/site/apt/index.apt
(original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/site/apt/index.apt Sun
Sep 14 02:28:08 2008
@@ -26,6 +26,6 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Introduction
+Maven Plugin Tool API
The Maven Plugin Tool API is the API to extract descriptors for all supported
Maven plugins.
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/site/apt/index.apt?rev=695160&r1=695159&r2=695160&view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/site/apt/index.apt
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/site/apt/index.apt
Sun Sep 14 02:28:08 2008
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Introduction
+Maven Plugin Tool for Beanshell
The Maven Plugin Tool for Beanshell is the Beanshell impl of
{{{../maven-plugin-tools-api/index.html}maven-plugin-tools-api}}
to extract descriptors for plugins written in Beanshell.
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt?rev=695160&r1=695159&r2=695160&view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt
(original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt Sun
Sep 14 02:28:08 2008
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Introduction
+Maven Plugin Tool for Java
The Maven Plugin Tool for Java is the Java impl of
{{{../maven-plugin-tools-api/index.html}maven-plugin-tools-api}}
to extract descriptors for plugins written in Java.
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/site/apt/index.apt?rev=695160&r1=695159&r2=695160&view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/site/apt/index.apt
(original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/site/apt/index.apt
Sun Sep 14 02:28:08 2008
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Introduction
+Maven Plugin Tools Javadoc
The Maven Plugin Tools Javadoc project is a collection of several
{{{http://java.sun.com/j2se/1.4.2/docs/tooldocs/javadoc/taglet/overview.html}taglets}}
which are used by
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-model/src/site/apt/index.apt
URL:
http://svn
svn commit: r695163 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main: ./ java/ java/foo/ java/foo/App.java
Author: dennisl
Date: Sun Sep 14 02:38:18 2008
New Revision: 695163
URL: http://svn.apache.org/viewvc?rev=695163&view=rev
Log:
o The Taglist Plugin does not generate a report unless there is a non-empty
source directory. That's why the IT failed.
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
(with props)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java?rev=695163&view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
Sun Sep 14 02:38:18 2008
@@ -0,0 +1,32 @@
+package foo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+}
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/main/java/foo/App.java
--
svn:eol-style = native
svn commit: r695167 - in /maven/release/trunk: maven-release-plugin/src/site/site.xml pom.xml
Author: bentmann
Date: Sun Sep 14 02:49:30 2008
New Revision: 695167
URL: http://svn.apache.org/viewvc?rev=695167&view=rev
Log:
o Inherited from maven-parent:9
Modified:
maven/release/trunk/maven-release-plugin/src/site/site.xml
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/site.xml?rev=695167&r1=695166&r2=695167&view=diff
==
--- maven/release/trunk/maven-release-plugin/src/site/site.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/site/site.xml Sun Sep 14
02:49:30 2008
@@ -1,60 +1,32 @@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"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.
+-->
-
-
-${project.name}
-http://maven.apache.org/images/apache-maven-project-2.png
-http://maven.apache.org/
-
-
-http://maven.apache.org/images/maven-logo-2.gif
-
-
-org.apache.maven.skins
-maven-stylus-skin
-
-
-
-
-
-
- http://www.apache.org/"/>
- http://maven.apache.org/maven-1.x"/>
- http://maven.apache.org/"/>
- http://maven.apache.org/plugins/"/>
- http://maven.apache.org/scm"/>
- http://maven.apache.org/wagon"/>
- http://maven.apache.org/jxr"/>
- http://maven.apache.org/doxia"/>
-
-
- http://www.google-analytics.com/urchin.js";
type="text/javascript">
-
-
-_uacct = "UA-140879-1";
-urchinTracker();
-
-
+
+
+ http://maven.apache.org/index.html"; />
+ http://maven.apache.org/plugins/index.html"; />
+ http://maven.apache.org/plugins/maven-release-plugin/index.html"; />
+
@@ -70,6 +42,5 @@
-
Modified: maven/release/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=695167&r1=695166&r2=695167&view=diff
==
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Sun Sep 14 02:49:30 2008
@@ -24,7 +24,7 @@
org.apache.maven
maven-parent
-9-SNAPSHOT
+9
../pom/maven/pom.xml
@@ -76,20 +76,4 @@
-
-
-
-
- apache.snapshots
- Apache Snapshot Repository
- http://people.apache.org/repo/m2-snapshot-repository
-
-false
-
-
-true
-
-
-
-
svn commit: r695177 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl
Date: Sun Sep 14 03:10:10 2008
New Revision: 695177
URL: http://svn.apache.org/viewvc?rev=695177&view=rev
Log:
o Do not run POMs recursively, so we can have multi module ITs.
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=695177&r1=695176&r2=695177&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Sep 14 03:10:10 2008
@@ -165,7 +165,7 @@
src/it
-**/**/pom.xml
+*/pom.xml
verify.bsh
${basedir}/target/local-repo
svn commit: r695178 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304: ./ child/ child/goals.txt child/pom.xml goals.txt pom.xml src/ src/site/ src/site/site.xml verify.bsh
Author: dennisl Date: Sun Sep 14 03:11:24 2008 New Revision: 695178 URL: http://svn.apache.org/viewvc?rev=695178&view=rev Log: [MSITE-304] site:stage-deploy creates different directory structure than site:site o Add an IT Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/ (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/ (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/src/site/site.xml (with props) maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (with props) Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/ -- --- svn:ignore (added) +++ svn:ignore Sun Sep 14 03:11:24 2008 @@ -0,0 +1,2 @@ +build.log +target Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/ -- --- svn:ignore (added) +++ svn:ignore Sun Sep 14 03:11:24 2008 @@ -0,0 +1,2 @@ +build.log +target Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt?rev=695178&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt Sun Sep 14 03:11:24 2008 @@ -0,0 +1 @@ +site:stage-deploy \ No newline at end of file Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/goals.txt -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml?rev=695178&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml Sun Sep 14 03:11:24 2008 @@ -0,0 +1,31 @@ + +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";> + +test +parent +1.0-SNAPSHOT + + 4.0.0 + child + pom + 1.0-SNAPSHOT + MSITE-304 IT child + http://www.example.com/parent/child/ + Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/child/pom.xml -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt?rev=695178&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt Sun Sep 14 03:11:24 2008 @@ -0,0 +1 @@ +site:stage-deploy \ No newline at end of file Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/goals.txt -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=695178&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sun
svn commit: r695179 - /maven/shared/trunk/maven-invoker/pom.xml
Author: bentmann Date: Sun Sep 14 03:16:33 2008 New Revision: 695179 URL: http://svn.apache.org/viewvc?rev=695179&view=rev Log: o Reordered POM Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=695179&r1=695178&r2=695179&view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sun Sep 14 03:16:33 2008 @@ -1,37 +1,49 @@ - + + + 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";> 4.0.0 + org.apache.maven.shared maven-shared-components 9 + maven-invoker 2.0.11-SNAPSHOT + Maven Invoker A component to programmatically invoke Maven. + + + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker +http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker + jira http://jira.codehaus.org/browse/MSHARED/component/13271 + org.codehaus.plexus @@ -45,6 +57,7 @@ test + @@ -87,6 +100,7 @@ + @@ -160,9 +174,4 @@ - - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker -http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker -
svn commit: r695180 - /maven/shared/trunk/pom.xml
Author: bentmann Date: Sun Sep 14 03:19:50 2008 New Revision: 695180 URL: http://svn.apache.org/viewvc?rev=695180&view=rev Log: o Reordered POM Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=695180&r1=695179&r2=695180&view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 14 03:19:50 2008 @@ -1,22 +1,24 @@ - + + + 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";> 4.0.0 @@ -31,22 +33,11 @@ maven-shared-components 10-SNAPSHOT pom + Maven Shared Components Maven shared components http://maven.apache.org/shared/ - -jira -http://jira.codehaus.org/browse/MSHARED - - - - - apache.website - scp://people.apache.org/www/maven.apache.org/shared/ - - - file-management maven-ant @@ -71,10 +62,9 @@ maven-verifier maven-web-ui-tests +Uses jdk 1.5 +maven-shared-model +--> @@ -82,6 +72,16 @@ scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/ http://svn.apache.org/viewvc/maven/shared/trunk/ + +jira +http://jira.codehaus.org/browse/MSHARED + + + + apache.website + scp://people.apache.org/www/maven.apache.org/shared/ + +
svn commit: r695182 - /maven/shared/trunk/pom.xml
Author: bentmann Date: Sun Sep 14 03:31:13 2008 New Revision: 695182 URL: http://svn.apache.org/viewvc?rev=695182&view=rev Log: o Enabled Plexus taglets for API docs Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=695182&r1=695181&r2=695182&view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 14 03:31:13 2008 @@ -101,4 +101,28 @@ + + + + reporting + + + +org.apache.maven.plugins +maven-javadoc-plugin +2.5 + + + + org.codehaus.plexus + plexus-javadoc + 1.0 + + + + + + + +
svn commit: r695185 - /maven/shared/trunk/maven-invoker/pom.xml
Author: bentmann Date: Sun Sep 14 03:40:44 2008 New Revision: 695185 URL: http://svn.apache.org/viewvc?rev=695185&view=rev Log: o Moved the reporting config into a profile o Updated to maven-javadoc-plugin:2.5 Modified: maven/shared/trunk/maven-invoker/pom.xml Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=695185&r1=695184&r2=695185&view=diff == --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Sun Sep 14 03:40:44 2008 @@ -101,77 +101,72 @@ - - - -org.apache.maven.plugins -maven-project-info-reports-plugin -2.1 - - -org.codehaus.mojo -cobertura-maven-plugin -2.2 - - -org.apache.maven.plugins -maven-surefire-report-plugin -2.4.3 - - - - report-only - - - - - -org.apache.maven.plugins -maven-changes-plugin -2.0 - - %URL%/%ISSUE% - - - - - changes-report - - - - - -org.apache.maven.plugins -maven-javadoc-plugin -2.4 - - true - -http://java.sun.com/javase/6/docs/api/ - - - - plexus.component - Xt - - - plexus.configuration - Xf - - - plexus.requirement - Xf - - - - - - - javadoc - - - - - - + + + reporting + + + +org.apache.maven.plugins +maven-project-info-reports-plugin +2.1 + + +org.codehaus.mojo +cobertura-maven-plugin +2.2 + + +org.apache.maven.plugins +maven-surefire-report-plugin +2.4.3 + + + + report-only + + + + + +org.apache.maven.plugins +maven-changes-plugin +2.0 + + %URL%/%ISSUE% + + + + + changes-report + + + + + +org.apache.maven.plugins +maven-javadoc-plugin +2.5 + + + + org.codehaus.plexus + plexus-javadoc + 1.0 + + + + + + + javadoc + test-javadoc + + + + + + + +
svn commit: r695189 - in /maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources: CopyResourcesMojo.java PropertyUtils.java ReflectionProperties.java Resource.java
Author: bentmann
Date: Sun Sep 14 04:09:20 2008
New Revision: 695189
URL: http://svn.apache.org/viewvc?rev=695189&view=rev
Log:
o Fixed Checkstyle errors
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java?rev=695189&r1=695188&r2=695189&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
Sun Sep 14 04:09:20 2008
@@ -1,8 +1,5 @@
package org.apache.maven.plugin.resources;
-import java.io.File;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -12,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- *http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -22,6 +19,9 @@
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
/**
* Copy resources of the configured plugin attribute resources
*
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java?rev=695189&r1=695188&r2=695189&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
Sun Sep 14 04:09:20 2008
@@ -28,7 +28,6 @@
import java.util.Iterator;
import java.util.Properties;
-
/**
* @deprecated use classes in the component maven-filtering
* TODO remove the class ?
@@ -46,8 +45,8 @@
/**
* Reads a property file, resolving all internal variables, using the
supplied base properties.
*
- * The properties are resolved iteratively, so if the value of property A
refers to property B, then after resolution
- * the value of property B will contain the value of property B.
+ * The properties are resolved iteratively, so if the value of property A
refers to property B, then after
+ * resolution the value of property B will contain the value of property B.
*
*
* @param propFile The property file to load.
@@ -111,32 +110,32 @@
final Properties baseProps = new Properties();
-if (useSystemProps)
+if ( useSystemProps )
{
-baseProps.putAll(System.getProperties());
+baseProps.putAll( System.getProperties() );
}
final Properties resolvedProps = new Properties();
try
{
-resolvedProps.putAll(loadPropertyFile(propfile, baseProps));
-} catch (FileNotFoundException e)
+resolvedProps.putAll( loadPropertyFile( propfile, baseProps ) );
+}
+catch ( FileNotFoundException e )
{
-if (fail)
+if ( fail )
{
-throw new FileNotFoundException(propfile.toString());
+throw new FileNotFoundException( propfile.toString() );
}
}
-if (useSystemProps)
+if ( useSystemProps )
{
-resolvedProps.putAll(baseProps);
+resolvedProps.putAll( baseProps );
}
return resolvedProps;
}
-
/**
* Retrieves a property value, replacing values like ${token}
* using the Properties to look them up.
@@ -166,7 +165,8 @@
v = v.substring( idx + 2 );
// if no matching } then bail
-if ( ( idx2 = v.indexOf( '}' ) ) < 0 )
+
svn commit: r695193 - /maven/shared/trunk/pom.xml
Author: bentmann Date: Sun Sep 14 04:27:23 2008 New Revision: 695193 URL: http://svn.apache.org/viewvc?rev=695193&view=rev Log: o Declared all relevant mailing lists Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=695193&r1=695192&r2=695193&view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 14 04:27:23 2008 @@ -38,6 +38,79 @@ Maven shared components http://maven.apache.org/shared/ + + + Maven User List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-users + +http://www.mail-archive.com/[EMAIL PROTECTED]/ + http://www.nabble.com/Maven---Users-f178.html +http://maven.users.markmail.org/ + + + + Maven Developer List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-dev + +http://www.mail-archive.com/[EMAIL PROTECTED]/ + http://www.nabble.com/Maven-Developers-f179.html +http://maven.dev.markmail.org/ + + + + Maven Issues List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-issues/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven---Issues-f15573.html +http://maven.issues.markmail.org/ + + + + Maven Commits List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-dev + + http://www.mail-archive.com/commits@maven.apache.org + http://www.nabble.com/Maven---Commits-f15575.html +http://maven.commits.markmail.org/ + + + + + Maven Announcements List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-announce/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven-Announcements-f15617.html +http://maven.announce.markmail.org/ + + + + Maven Notifications List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-notifications/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven---Notifications-f15574.html +http://maven.notifications.markmail.org/ + + + + file-management maven-ant
svn commit: r695196 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/extension/ maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/pr
Author: sisbell
Date: Sun Sep 14 04:34:27 2008
New Revision: 695196
URL: http://svn.apache.org/viewvc?rev=695196&view=rev
Log:
Fix: mng3746 - Implemented proper ordering of system, user and model properties
used in interpolation. this required creating a tag value, which could be used
for comparing and ordering of InterpolatorProperty.
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=695196&r1=695195&r2=695196&view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Sun Sep 14 04:34:27 2008
@@ -36,6 +36,7 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.builder.PomClassicTransformer;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.extension.lineage.ModelLineage;
import org.apache.maven.extension.lineage.ModelLineageBuilder;
import org.apache.maven.extension.lineage.ModelLineageIterator;
@@ -163,8 +164,10 @@
config.setExecutionProperties( execProps );
List interpolatorProperties = new
ArrayList();
-interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties(
config.getExecutionProperties()));
-interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties()));
+interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getExecutionProperties(),
+PomInterpolatorTag.SYSTEM_PROPERTIES.name()));
+interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(),
+PomInterpolatorTag.USER_PROPERTIES.name()));
model = PomClassicTransformer.interpolateModel( model,
interpolatorProperties, modelPom.getParentFile());
grabManagedPluginsWithExtensionsFlagTurnedOn( model,
managedPluginsWithExtensionsFlag );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=695196&r1=695195&r2=695196&view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Sep 14 04:34:27 2008
@@ -61,6 +61,7 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ModelUtils;
import org.apache.maven.project.builder.PomClassicTransformer;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.realm.MavenRealmManager;
@@ -556,10 +557,12 @@
if ( dom != null )
{
try
-{
+{
List interpolatorProperties = new
ArrayList();
-interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties(
session.getProjectBuilderConfiguration().getExecutionProperties()));
-interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties(
session.getProjectBuilderConfiguration().getUserProperties()));
+interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties(
session.getProjectBuilderConfiguration().getExecutionProperties(),
+
svn commit: r695197 - /maven/release/trunk/pom.xml
Author: bentmann Date: Sun Sep 14 04:37:48 2008 New Revision: 695197 URL: http://svn.apache.org/viewvc?rev=695197&view=rev Log: o Declared all relevant mailing lists Modified: maven/release/trunk/pom.xml Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=695197&r1=695196&r2=695197&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Sun Sep 14 04:37:48 2008 @@ -35,9 +35,78 @@ Maven Release - -1.1 - + + + Maven User List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-users + +http://www.mail-archive.com/[EMAIL PROTECTED]/ + http://www.nabble.com/Maven---Users-f178.html +http://maven.users.markmail.org/ + + + + Maven Developer List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-dev + +http://www.mail-archive.com/[EMAIL PROTECTED]/ + http://www.nabble.com/Maven-Developers-f179.html +http://maven.dev.markmail.org/ + + + + Maven Issues List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-issues/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven---Issues-f15573.html +http://maven.issues.markmail.org/ + + + + Maven Commits List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-dev + + http://www.mail-archive.com/commits@maven.apache.org + http://www.nabble.com/Maven---Commits-f15575.html +http://maven.commits.markmail.org/ + + + + + Maven Announcements List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-announce/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven-Announcements-f15617.html +http://maven.announce.markmail.org/ + + + + Maven Notifications List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-notifications/ + +http://www.mail-archive.com/[EMAIL PROTECTED] + http://www.nabble.com/Maven---Notifications-f15574.html +http://maven.notifications.markmail.org/ + + + maven-release-manager @@ -54,6 +123,10 @@ http://jira.codehaus.org/browse/MRELEASE + +1.1 + +
svn commit: r695198 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304: pom.xml verify.bsh
Author: dennisl
Date: Sun Sep 14 04:39:32 2008
New Revision: 695198
URL: http://svn.apache.org/viewvc?rev=695198&view=rev
Log:
o Use a directory for the stage deploy that is writable on a Unix system.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=695198&r1=695197&r2=695198&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sun Sep 14
04:39:32 2008
@@ -28,7 +28,7 @@
msite-304
Example company web server
- file:///www.example.com/parent
+ file:///tmp/www.example.com/parent
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=695198&r1=695197&r2=695198&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sun Sep
14 04:39:32 2008
@@ -38,14 +38,14 @@
return false;
}
-File parentDirectory = new File ( stagingDirectory,
"localhost/www.example.com/parent" );
+File parentDirectory = new File ( stagingDirectory,
"localhost/tmp/www.example.com/parent" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "Staging directory for parent is missing or not a
directory." );
return false;
}
-File childDirectory = new File ( stagingDirectory,
"localhost/www.example.com/parent/child" );
+File childDirectory = new File ( stagingDirectory,
"localhost/tmp/www.example.com/parent/child" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "Staging directory for child is missing or not a
directory." );
svn commit: r695200 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml
Author: bentmann Date: Sun Sep 14 04:54:08 2008 New Revision: 695200 URL: http://svn.apache.org/viewvc?rev=695200&view=rev Log: o Fixed IT Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml?rev=695200&r1=695199&r2=695200&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/pom.xml Sun Sep 14 04:54:08 2008 @@ -34,4 +34,15 @@ child + + + + + + maven-site-plugin + @pom.version@ + + + +
svn commit: r695201 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: bentmann
Date: Sun Sep 14 04:58:01 2008
New Revision: 695201
URL: http://svn.apache.org/viewvc?rev=695201&view=rev
Log:
o Enabled cloning of IT projects to keep source tree clean
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=695201&r1=695200&r2=695201&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Sep 14 04:58:01 2008
@@ -164,6 +164,7 @@
maven-invoker-plugin
src/it
+ ${project.build.directory}/it
*/pom.xml
svn commit: r695216 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Author: sisbell
Date: Sun Sep 14 06:29:36 2008
New Revision: 695216
URL: http://svn.apache.org/viewvc?rev=695216&view=rev
Log:
Re-enabled some of the tests for maven-3.0.x. Disabled 3729 due to infinite
looping on Mac.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3729MultiForkAggregatorsTest.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=695216&r1=695215&r2=695216&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
Sun Sep 14 06:29:36 2008
@@ -11,11 +11,6 @@
public class MavenIT0092Test
extends AbstractMavenIntegrationTestCase
{
-public MavenIT0092Test()
-throws InvalidVersionSpecificationException
-{
-super( "[,2.99.99)" );
-}
/**
* Test that legacy repositories with legacy snapshots download correctly.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java?rev=695216&r1=695215&r2=695216&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
Sun Sep 14 06:29:36 2008
@@ -19,11 +19,6 @@
public class MavenITmng3693PomFileBasedirChangeTest
extends AbstractMavenIntegrationTestCase
{
-public MavenITmng3693PomFileBasedirChangeTest()
-throws InvalidVersionSpecificationException
-{
-super( "[,2.99.99)" );
-}
public void testitMNG3693 ()
throws Exception
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java?rev=695216&r1=695215&r2=695216&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
Sun Sep 14 06:29:36 2008
@@ -38,7 +38,7 @@
public MavenITmng3703ExecutionProjectWithRelativePathsTest()
throws InvalidVersionSpecificationException
{
-super( "(2.0.99,2.99.99)" ); // only test in 2.0.9+
+super( "(2.0.99,)" ); // only test in 2.0.9+
}
public void testForkFromMojo()
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3729MultiForkAggregatorsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3729MultiForkAggregatorsTest.java?rev=695216&r1=695215&r2=695216&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3729MultiForkAggregatorsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenI
svn commit: r695217 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Author: dennisl
Date: Sun Sep 14 06:36:30 2008
New Revision: 695217
URL: http://svn.apache.org/viewvc?rev=695217&view=rev
Log:
o Verify that the site:stage-deploy directory structure is correct.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=695217&r1=695216&r2=695217&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Sun Sep
14 06:36:30 2008
@@ -51,6 +51,27 @@
System.err.println( "Staging directory for child is missing or not a
directory." );
return false;
}
+
+File stageDeployDirectory = new File ( "/tmp/www.example.com/parent" );
+if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory()
)
+{
+System.err.println( "Stage deploy directory is missing or not a
directory." );
+return false;
+}
+
+File validChildStageDeployDirectory = new File ( stageDeployDirectory,
"staging/child" );
+if ( !validChildStageDeployDirectory.exists() ||
!validChildStageDeployDirectory.isDirectory() )
+{
+System.err.println( "Valid stage deploy directory for child is missing
or not a directory." );
+return false;
+}
+
+File invalidChildStageDeployDirectory = new File ( stageDeployDirectory,
"child/staging" );
+if ( invalidChildStageDeployDirectory.exists() &&
invalidChildStageDeployDirectory.isDirectory() )
+{
+System.err.println( "Invalid stage deploy directory for child is
present." );
+return false;
+}
}
catch( IOException e )
{
svn commit: r695239 - /maven/plugins/trunk/maven-docck-plugin/pom.xml
Author: dennisl Date: Sun Sep 14 08:33:55 2008 New Revision: 695239 URL: http://svn.apache.org/viewvc?rev=695239&view=rev Log: o Sync the versions of Maven core dependencies with the prerequisite Maven version. Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=695239&r1=695238&r2=695239&view=diff == --- maven/plugins/trunk/maven-docck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-docck-plugin/pom.xml Sun Sep 14 08:33:55 2008 @@ -72,7 +72,7 @@ org.apache.maven maven-plugin-descriptor - 2.0 + 2.0.6 @@ -103,22 +103,22 @@ org.apache.maven maven-project - 2.0 + 2.0.6 org.apache.maven maven-model - 2.0 + 2.0.6 org.apache.maven maven-settings - 2.0.4 + 2.0.6 org.apache.maven maven-plugin-api - 2.0 + 2.0.6 org.codehaus.plexus
svn commit: r695241 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java maven-project/src/main/java/org/apache/maven/project/DefaultMave
Author: sisbell
Date: Sun Sep 14 08:36:56 2008
New Revision: 695241
URL: http://svn.apache.org/viewvc?rev=695241&view=rev
Log:
Fix: mng2562 - timestamp
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=695241&r1=695240&r2=695241&view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Sun Sep 14 08:36:56 2008
@@ -49,14 +49,8 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+import java.text.SimpleDateFormat;
public class DefaultBuildExtensionScanner
implements BuildExtensionScanner, LogEnabled
@@ -163,11 +157,20 @@
config.setExecutionProperties( execProps );
+//INTERPOLATION
List interpolatorProperties = new
ArrayList();
interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getExecutionProperties(),
PomInterpolatorTag.SYSTEM_PROPERTIES.name()));
interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(),
PomInterpolatorTag.USER_PROPERTIES.name()));
+if(config.getBuildStartTime() != null)
+{
+interpolatorProperties.add(new
InterpolatorProperty("${build.timestamp}",
+new SimpleDateFormat("MMdd-hhmm").format(
config.getBuildStartTime() ),
+PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+}
+
+
model = PomClassicTransformer.interpolateModel( model,
interpolatorProperties, modelPom.getParentFile());
grabManagedPluginsWithExtensionsFlagTurnedOn( model,
managedPluginsWithExtensionsFlag );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=695241&r1=695240&r2=695241&view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Sun Sep 14 08:36:56 2008
@@ -64,11 +64,8 @@
import java.io.StringReader;
import java.io.Writer;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.text.SimpleDateFormat;
/**
@@ -538,6 +535,13 @@
interpolatorProperties.addAll(
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(),
PomInterpolatorTag.USER_PROPERTIES.name()));
+if(config.getBuildStartTime() != null)
+{
+interpolatorProperties.add(new
InterpolatorProperty("${build.timestamp}",
+new SimpleDateFormat("MMdd-hhmm").format(
config.getBuildStartTime() ),
+PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+}
+
MavenProject mavenProject;
try
{
svn commit: r695242 - /maven/plugins/trunk/maven-docck-plugin/pom.xml
Author: dennisl Date: Sun Sep 14 08:42:53 2008 New Revision: 695242 URL: http://svn.apache.org/viewvc?rev=695242&view=rev Log: o Update to maven-plugin-tools 2.4.3 and remove the temporary fix for MDOCCK-12. Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=695242&r1=695241&r2=695242&view=diff == --- maven/plugins/trunk/maven-docck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-docck-plugin/pom.xml Sun Sep 14 08:42:53 2008 @@ -67,37 +67,23 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - 2.4.2 + 2.4.3 org.apache.maven maven-plugin-descriptor 2.0.6 - - - com.thoughtworks.qdox - qdox - 1.6.3 - runtime - org.apache.maven.plugin-tools maven-plugin-tools-java - 2.4.2 + 2.4.3 runtime - - - - qdox - qdox - - org.apache.maven.plugin-tools maven-plugin-tools-beanshell - 2.4.2 + 2.4.3 runtime
svn commit: r695246 - in /maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck: AbstractCheckDocumentationMojo.java reports/DocumentationReporter.java
Author: dennisl
Date: Sun Sep 14 09:06:57 2008
New Revision: 695246
URL: http://svn.apache.org/viewvc?rev=695246&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java
Modified:
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java?rev=695246&r1=695245&r2=695246&view=diff
==
---
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
(original)
+++
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
Sun Sep 14 09:06:57 2008
@@ -119,7 +119,8 @@
httpClient = new HttpClient();
-
httpClient.getHttpConnectionManager().getParams().setConnectionTimeout( 5000 );
+final int connectionTimeout = 5000;
+
httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(
connectionTimeout );
httpClient.getParams().setParameter( HttpMethodParams.USER_AGENT,
httpUserAgent );
}
Modified:
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java?rev=695246&r1=695245&r2=695246&view=diff
==
---
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java
(original)
+++
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java
Sun Sep 14 09:06:57 2008
@@ -28,7 +28,7 @@
*/
public class DocumentationReporter
{
-List reports = new ArrayList();
+private List reports = new ArrayList();
public void info( String message )
{
svn commit: r695247 - in /maven/plugins/trunk/maven-docck-plugin/src/site: apt/examples/file-output.apt apt/usage.apt fml/faq.fml
Author: dennisl Date: Sun Sep 14 09:08:24 2008 New Revision: 695247 URL: http://svn.apache.org/viewvc?rev=695247&view=rev Log: o Polish the site. Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt?rev=695247&r1=695246&r2=695247&view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt Sun Sep 14 09:08:24 2008 @@ -2,6 +2,7 @@ Sending the output to a file -- -- + 2008-09-14 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -26,17 +27,17 @@ Sending the output to a file -* Configuring your pom.xml +* Configuring your <<>> You can use the following configuration in your <<>> to run the DOCCK Plugin everytime the project is built and send its output to a file. +---+ - [...] + ... - [...] + ... org.apache.maven.plugins maven-docck-plugin @@ -51,10 +52,10 @@ - [...] + ... - [...] + ... +---+ Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt?rev=695247&r1=695246&r2=695247&view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt Sun Sep 14 09:08:24 2008 @@ -2,7 +2,7 @@ Usage -- -- - 19-June-2006 + 2008-09-14 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -28,21 +28,21 @@ Usage This document is intended to provide instructions for using the - maven-docck-plugin. In order for this discussion to be useful, it's + Maven DOCCK Plugin. In order for this discussion to be useful, it's critical to cover two topics: Configuring your project's <<>> to run the plugin during every build and using the plugin from the command-line. -* Configuring the plugin in pom.xml +* Configuring the plugin in <<>> You can use the following configuration in your <<>> to run the DOCCK Plugin everytime the project is built. +---+ - [...] + ... - [...] + ... org.apache.maven.plugins maven-docck-plugin @@ -54,10 +54,10 @@ - [...] + ... - [...] + ... +---+ @@ -66,7 +66,7 @@ The DOCCK Plugin is easily executed from the command line since it can run without any parameter configuration. - To run the DOCCK Plugin on a project, use: + To run the DOCCK Plugin on a project, type: +---+ mvn docck:check Modified: maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml?rev=695247&r1=695246&r2=695247&view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml Sun Sep 14 09:08:24 2008 @@ -26,10 +26,10 @@ The plugin documentation standard was created to address the frequent - complaint of lack of documentation, specifically on the maven plugins. - The standard was based on suggestions made on the maven dev mailing + complaint of lack of documentation, specifically for the Maven plugins. + The standard was based on suggestions made on the Maven dev mailing list with some refinements. It is a community consensus of what basic - documentation a maven plugin should have. + documentation a Maven plugin should have.
svn commit: r695248 - /maven/plugins/trunk/maven-docck-plugin/pom.xml
Author: dennisl Date: Sun Sep 14 09:14:19 2008 New Revision: 695248 URL: http://svn.apache.org/viewvc?rev=695248&view=rev Log: o No more beta. Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=695248&r1=695247&r2=695248&view=diff == --- maven/plugins/trunk/maven-docck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-docck-plugin/pom.xml Sun Sep 14 09:14:19 2008 @@ -27,7 +27,7 @@ maven-docck-plugin - 1.0-beta-3-SNAPSHOT + 1.0-SNAPSHOT maven-plugin Maven Documentation Checker Plugin
svn commit: r695249 - in /maven/plugins/trunk/maven-docck-plugin/src: main/java/org/apache/maven/plugin/docck/reports/ site/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl Date: Sun Sep 14 09:15:59 2008 New Revision: 695249 URL: http://svn.apache.org/viewvc?rev=695249&view=rev Log: o Set subversion keywords. Modified: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/AbstractDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/ErrorDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/InfoDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/WarningDocumentationReport.java (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/index.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml (props changed) maven/plugins/trunk/maven-docck-plugin/src/site/site.xml (props changed) Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/AbstractDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/DocumentationReporter.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/ErrorDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/InfoDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/reports/WarningDocumentationReport.java -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/index.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/fml/faq.fml -- svn:keywords = Date Id Propchange: maven/plugins/trunk/maven-docck-plugin/src/site/site.xml -- svn:keywords = Date Id
svn commit: r695250 - in /maven/plugins/trunk/maven-docck-plugin/src/site/apt: examples/file-output.apt usage.apt
Author: dennisl Date: Sun Sep 14 09:19:53 2008 New Revision: 695250 URL: http://svn.apache.org/viewvc?rev=695250&view=rev Log: o Promote best practices by specifying the version in POM examples. Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt?rev=695250&r1=695249&r2=695250&view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/examples/file-output.apt Sun Sep 14 09:19:53 2008 @@ -41,6 +41,7 @@ org.apache.maven.plugins maven-docck-plugin +1.0 Modified: maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt?rev=695250&r1=695249&r2=695250&view=diff == --- maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-docck-plugin/src/site/apt/usage.apt Sun Sep 14 09:19:53 2008 @@ -46,6 +46,7 @@ org.apache.maven.plugins maven-docck-plugin +1.0
