svn commit: r748976 - /maven/site/trunk/src/site/fml/general.fml
Author: hboutemy Date: Sun Mar 1 08:42:47 2009 New Revision: 748976 URL: http://svn.apache.org/viewvc?rev=748976view=rev Log: updated documentation to use http://maven.apache.org/xsd/* for schema location Modified: maven/site/trunk/src/site/fml/general.fml Modified: maven/site/trunk/src/site/fml/general.fml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/fml/general.fml?rev=748976r1=748975r2=748976view=diff == --- maven/site/trunk/src/site/fml/general.fml (original) +++ maven/site/trunk/src/site/fml/general.fml Sun Mar 1 08:42:47 2009 @@ -331,7 +331,7 @@ questionWhere are the Maven XSD schemas?/question answer p - The Maven XSD is located a href=http://maven.apache.org/maven-v4_0_0.xsd;here/a and the Maven + The Maven XSD is located a href=http://maven.apache.org/xsd/maven-4.0.0.xsd;here/a and the Maven Settings XSD is located a href=http://maven.apache.org/xsd/settings-1.0.0.xsd;here/a. /p p @@ -341,7 +341,7 @@ lt;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.xsdgt; + http://maven.apache.org/xsd/maven-4.0.0.xsdgt; ... lt;/projectgt;/source
svn commit: r748978 - in /maven/archetype/trunk: ./ archetype-common/ archetype-packaging/ archetype-plugin/ archetype-samples/ archetype-samples/mojo/ archetype-samples/quickstart/ archetype-samples/
Author: hboutemy Date: Sun Mar 1 08:45:29 2009 New Revision: 748978 URL: http://svn.apache.org/viewvc?rev=748978view=rev Log: used http://maven.apache.org/xsd/* for schema location Modified: maven/archetype/trunk/archetype-common/pom.xml maven/archetype/trunk/archetype-packaging/pom.xml maven/archetype/trunk/archetype-plugin/pom.xml maven/archetype/trunk/archetype-samples/mojo/pom.xml maven/archetype/trunk/archetype-samples/pom.xml maven/archetype/trunk/archetype-samples/quickstart/pom.xml maven/archetype/trunk/archetype-samples/webapp/pom.xml maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml maven/archetype/trunk/archetype-testing/pom.xml maven/archetype/trunk/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=748978r1=748977r2=748978view=diff == --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Sun Mar 1 08:45:29 2009 @@ -1,5 +1,5 @@ ?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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion @@ -11,7 +11,7 @@ artifactIdarchetype-common/artifactId nameMaven Archetype Common/name packagingjar/packaging - dependencies + dependencies dependency groupIdorg.apache.maven/groupId artifactIdmaven-core/artifactId @@ -401,7 +401,7 @@ /plugin /plugins /reporting - + profiles profile idinternal-catalog/id @@ -418,7 +418,7 @@ /configuration /plugin /plugins - /build + /build /profile /profiles /project Modified: maven/archetype/trunk/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-packaging/pom.xml?rev=748978r1=748977r2=748978view=diff == --- maven/archetype/trunk/archetype-packaging/pom.xml (original) +++ maven/archetype/trunk/archetype-packaging/pom.xml Sun Mar 1 08:45:29 2009 @@ -1,4 +1,4 @@ -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=748978r1=748977r2=748978view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sun Mar 1 08:45:29 2009 @@ -1,5 +1,5 @@ ?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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion @@ -24,7 +24,7 @@ prerequisites maven2.0.7/maven /prerequisites - + scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin/developerConnection Modified: maven/archetype/trunk/archetype-samples/mojo/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-samples/mojo/pom.xml?rev=748978r1=748977r2=748978view=diff == --- maven/archetype/trunk/archetype-samples/mojo/pom.xml (original) +++ maven/archetype/trunk/archetype-samples/mojo/pom.xml Sun Mar 1 08:45:29 2009 @@ -1,8 +1,8 @@ ?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
svn commit: r748979 - /maven/ant-tasks/trunk/pom.xml
Author: hboutemy Date: Sun Mar 1 08:49:29 2009 New Revision: 748979 URL: http://svn.apache.org/viewvc?rev=748979view=rev Log: used http://maven.apache.org/xsd/* for schema location Modified: maven/ant-tasks/trunk/pom.xml Modified: maven/ant-tasks/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=748979r1=748978r2=748979view=diff == --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Sun Mar 1 08:49:29 2009 @@ -19,7 +19,7 @@ under the License. -- -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent
svn commit: r748982 - in /maven/components/trunk: ./ apache-maven/ maven-compat/ maven-core/ maven-embedder/ maven-lifecycle/ maven-mercury/ maven-model/ maven-plugin-api/ maven-project-builder/ maven
Author: hboutemy Date: Sun Mar 1 08:55:40 2009 New Revision: 748982 URL: http://svn.apache.org/viewvc?rev=748982view=rev Log: used http://maven.apache.org/xsd/* for schema location Modified: maven/components/trunk/apache-maven/pom.xml maven/components/trunk/maven-compat/pom.xml maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-lifecycle/pom.xml maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-model/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-project-builder/pom.xml maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-reporting-api/pom.xml maven/components/trunk/maven-repository/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/pom.xml?rev=748982r1=748981r2=748982view=diff == --- maven/components/trunk/apache-maven/pom.xml (original) +++ maven/components/trunk/apache-maven/pom.xml Sun Mar 1 08:55:40 2009 @@ -13,7 +13,7 @@ License for the specific language governing permissions and limitations under the License. -- -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent artifactIdmaven/artifactId Modified: maven/components/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=748982r1=748981r2=748982view=diff == --- maven/components/trunk/maven-compat/pom.xml (original) +++ maven/components/trunk/maven-compat/pom.xml Sun Mar 1 08:55:40 2009 @@ -8,7 +8,7 @@ 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 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; +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/xsd/maven-4.0.0.xsd; parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=748982r1=748981r2=748982view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Mar 1 08:55:40 2009 @@ -10,7 +10,7 @@ governing permissions and limitations under the License. -- -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; +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/xsd/maven-4.0.0.xsd; parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId @@ -120,7 +120,7 @@ dependency groupIdcommons-jxpath/groupId artifactIdcommons-jxpath/artifactId -/dependency +/dependency /dependencies build plugins Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=748982r1=748981r2=748982view=diff == --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Sun Mar 1 08:55:40 2009 @@ -8,7 +8,7 @@ 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 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; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
svn commit: r748984 - in /maven/components/branches/maven-2.1.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core-it-runner/ maven-core/ maven-error-diagnostics
Author: hboutemy Date: Sun Mar 1 09:02:07 2009 New Revision: 748984 URL: http://svn.apache.org/viewvc?rev=748984view=rev Log: used http://maven.apache.org/xsd/* for schema location Modified: maven/components/branches/maven-2.1.x/apache-maven/pom.xml maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.1.x/maven-artifact/pom.xml maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.1.x/maven-core/pom.xml maven/components/branches/maven-2.1.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml maven/components/branches/maven-2.1.x/maven-model/pom.xml maven/components/branches/maven-2.1.x/maven-monitor/pom.xml maven/components/branches/maven-2.1.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.1.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.1.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.1.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.1.x/maven-profile/pom.xml maven/components/branches/maven-2.1.x/maven-project/pom.xml maven/components/branches/maven-2.1.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.1.x/maven-reporting/pom.xml maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.1.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.1.x/maven-script/pom.xml maven/components/branches/maven-2.1.x/maven-settings/pom.xml maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml maven/components/branches/maven-2.1.x/pom.xml Modified: maven/components/branches/maven-2.1.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/pom.xml?rev=748984r1=748983r2=748984view=diff == --- maven/components/branches/maven-2.1.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.1.x/apache-maven/pom.xml Sun Mar 1 09:02:07 2009 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. -- -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml?rev=748984r1=748983r2=748984view=diff == --- maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml Sun Mar 1 09:02:07 2009 @@ -16,7 +16,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---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; +-- +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/xsd/maven-4.0.0.xsd; parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId Modified: maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml?rev=748984r1=748983r2=748984view=diff == --- maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.1.x/maven-artifact-test/pom.xml Sun Mar 1 09:02:07 2009 @@ -16,7 +16,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---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; +-- +project xmlns=http://maven.apache.org/POM/4.0.0;
svn commit: r748985 - /maven/components/branches/maven-2.1.x/pom.xml
Author: hboutemy Date: Sun Mar 1 09:04:32 2009 New Revision: 748985 URL: http://svn.apache.org/viewvc?rev=748985view=rev Log: reverted Doxia 1.1 test committed by mistake Modified: maven/components/branches/maven-2.1.x/pom.xml Modified: maven/components/branches/maven-2.1.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=748985r1=748984r2=748985view=diff == --- maven/components/branches/maven-2.1.x/pom.xml (original) +++ maven/components/branches/maven-2.1.x/pom.xml Sun Mar 1 09:04:32 2009 @@ -379,7 +379,7 @@ dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-sink-api/artifactId -version1.1-SNAPSHOT/version +version1.0/version /dependency !-- Plexus -- dependency
svn commit: r748986 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core-it-runner/ maven-core/ maven-error-diagnostics
Author: hboutemy Date: Sun Mar 1 09:08:44 2009 New Revision: 748986 URL: http://svn.apache.org/viewvc?rev=748986view=rev Log: used http://maven.apache.org/xsd/* for schema location Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=748986r1=748985r2=748986view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Sun Mar 1 09:08:44 2009 @@ -18,7 +18,7 @@ under the License. -- -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=748986r1=748985r2=748986view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Sun Mar 1 09:08:44 2009 @@ -19,7 +19,7 @@ under the License. -- -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; +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/xsd/maven-4.0.0.xsd; parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=748986r1=748985r2=748986view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Sun Mar 1 09:08:44 2009 @@ -19,7 +19,7 @@ under the License. -- -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; +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/xsd/maven-4.0.0.xsd; parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL:
svn commit: r749004 - /maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Author: vsiveton
Date: Sun Mar 1 11:55:55 2009
New Revision: 749004
URL: http://svn.apache.org/viewvc?rev=749004view=rev
Log:
o be sure to close sink
Modified:
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Modified:
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=749004r1=749003r2=749004view=diff
==
---
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
(original)
+++
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Sun Mar 1 11:55:55 2009
@@ -171,6 +171,10 @@
{
throw new RendererException( Error rendering Maven report: +
e.getMessage(), e );
}
+finally
+{
+sink.close();
+}
if ( !report.isExternalReport() )
{
@@ -188,7 +192,14 @@
Writer out = new FileWriter( new File(
mySink.getOutputDir(), mySink.getOutputName() ) );
-renderer.generateDocument( out, mySink,
siteRenderingContext );
+try
+{
+renderer.generateDocument( out, mySink,
siteRenderingContext );
+}
+finally
+{
+mySink.close();
+}
}
}
catch ( IOException e )
svn commit: r749005 - /maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
Author: vsiveton Date: Sun Mar 1 11:59:46 2009 New Revision: 749005 URL: http://svn.apache.org/viewvc?rev=749005view=rev Log: o fix prerequisites Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml?rev=749005r1=749004r2=749005view=diff == --- maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml (original) +++ maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Sun Mar 1 11:59:46 2009 @@ -147,7 +147,7 @@ NOTE: 2.1.0-M2 trunk does not yet use doxia-1.1, need to build locally. Plan is to switch 2.1.0-M3 to doxia-1.1, see MNG-3402 -- -maven2.1.0-M2-SNAPSHOT/maven +maven2.1.0-SNAPSHOT/maven /prerequisites scm
svn commit: r749006 - /maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml
Author: vsiveton Date: Sun Mar 1 12:00:48 2009 New Revision: 749006 URL: http://svn.apache.org/viewvc?rev=749006view=rev Log: o fix prerequisites Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml?rev=749006r1=749005r2=749006view=diff == --- maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml (original) +++ maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/pom.xml Sun Mar 1 12:00:48 2009 @@ -54,7 +54,7 @@ /contributors prerequisites -maven2.1.0-M2-SNAPSHOT/maven +maven2.1.0-SNAPSHOT/maven /prerequisites scm
svn commit: r749007 - /maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Author: vsiveton Date: Sun Mar 1 12:03:39 2009 New Revision: 749007 URL: http://svn.apache.org/viewvc?rev=749007view=rev Log: o fix import Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=749007r1=749006r2=749007view=diff == --- maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original) +++ maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Sun Mar 1 12:03:39 2009 @@ -23,7 +23,7 @@ import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; +import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.siterenderer.Renderer;
svn commit: r749010 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2921/ resources/mng-2921/consumer/ resources/mng-2921/ejbs/ resources/mng
Author: bentmann Date: Sun Mar 1 12:19:04 2009 New Revision: 749010 URL: http://svn.apache.org/viewvc?rev=749010view=rev Log: [MNG-2921] ejb-client dependency no longer resolved in reactor build o Strengthened IT to capture regression introduced by misplaced else block in r742799 Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/client.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/producer/tests.jar (with props) Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java?rev=749010r1=749009r2=749010view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java Sun Mar 1 12:19:04 2009 @@ -64,14 +64,28 @@ Collection compileArtifacts = verifier.loadLines( consumer/target/compile.txt, UTF-8 ); assertTrue( compileArtifacts.toString(), compileArtifacts.contains( org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT ) ); +assertTrue( compileArtifacts.toString(), +compileArtifacts.contains( org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT ) ); assertFalse( compileArtifacts.toString(), compileArtifacts.contains( org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT ) ); +assertFalse( compileArtifacts.toString(), +compileArtifacts.contains( org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT ) ); Collection testArtifacts = verifier.loadLines( consumer/target/test.txt, UTF-8 ); assertTrue( testArtifacts.toString(), testArtifacts.contains( org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT ) ); assertTrue( testArtifacts.toString(), +testArtifacts.contains( org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT ) ); +assertTrue( testArtifacts.toString(), testArtifacts.contains( org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT ) ); +assertTrue( testArtifacts.toString(), +testArtifacts.contains( org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT ) ); + +Collection testClassPath = verifier.loadLines( consumer/target/test-classpath.txt, UTF-8 ); +assertTrue( testClassPath.toString(), testClassPath.contains( ejbs/attached.jar ) ); +assertTrue( testClassPath.toString(), testClassPath.contains( tests/attached.jar ) ); +assertTrue( testClassPath.toString(), testClassPath.contains( producer/client.jar ) ); +assertTrue( testClassPath.toString(), testClassPath.contains( producer/tests.jar ) ); } } Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml?rev=749010r1=749009r2=749010view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml Sun Mar 1 12:19:04 2009 @@ -52,6 +52,21 @@ version1.0-SNAPSHOT/version scopetest/scope /dependency +!-- NOTE: It is essential part of the test to also depend on multiple attached artifacts from
svn commit: r749011 - /maven/doxia/site/src/site/site.xml
Author: dennisl Date: Sun Mar 1 12:22:53 2009 New Revision: 749011 URL: http://svn.apache.org/viewvc?rev=749011view=rev Log: o Make the link to the Developer docs for Doxia Sitetools versioned. Modified: maven/doxia/site/src/site/site.xml Modified: maven/doxia/site/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/src/site/site.xml?rev=749011r1=749010r2=749011view=diff == --- maven/doxia/site/src/site/site.xml (original) +++ maven/doxia/site/src/site/site.xml Sun Mar 1 12:22:53 2009 @@ -58,7 +58,7 @@ menu name=Developer docs item name=Doxia 1.0.x href=doxia-1.0.x/index.html/ - item name=Doxia Sitetools href=doxia-sitetools/index.html/ + item name=Doxia Sitetools 1.0.x href=doxia-sitetools-1.0.x/index.html/ item name=Doxia Tools href=doxia-tools/index.html/ /menu
svn commit: r749014 - /maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
Author: hboutemy Date: Sun Mar 1 12:38:37 2009 New Revision: 749014 URL: http://svn.apache.org/viewvc?rev=749014view=rev Log: fixed maven core dependency Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml?rev=749014r1=749013r2=749014view=diff == --- maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml (original) +++ maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Sun Mar 1 12:38:37 2009 @@ -201,7 +201,7 @@ dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-api/artifactId - version2.1.0-M2-SNAPSHOT/version + version2.1.0-SNAPSHOT/version /dependency !-- Doxia --
svn commit: r749015 - /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Author: vsiveton
Date: Sun Mar 1 12:41:31 2009
New Revision: 749015
URL: http://svn.apache.org/viewvc?rev=749015view=rev
Log:
DOXIA-292: Be sure to call tableRows(int[], boolean) to be backward compatible
with Doxia 1.0
o fixed
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=749015r1=749014r2=749015view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Sun Mar 1 12:41:31 2009
@@ -95,6 +95,21 @@
/** Indicates that an image is part of a figure. */
private boolean inFigure;
+/** Flag to know if {...@link #tableRows(int[], boolean)} is called or
not. It is mainly to be backward compatible
+ * with some plugins (like checkstyle) which uses:
+ * pre
+ * sink.table();
+ * sink.tableRow();
+ * /pre
+ * instead of
+ * pre
+ * sink.table();
+ * sink.tableRows( justify, true );
+ * sink.tableRow();
+ * /pre
+ * */
+boolean tableRows = false;
+
// --
// Constructor
// --
@@ -1085,6 +1100,8 @@
/** {...@inheritdoc} */
public void table( SinkEventAttributes attributes )
{
+this.tableRows = false;
+
if ( paragraphFlag )
{
// The content of element type p must match
@@ -,6 +1128,8 @@
*/
public void table_()
{
+this.tableRows = false;
+
writeEndTag( Tag.TABLE );
String content = tempWriter.toString();
@@ -1168,6 +1187,8 @@
*/
public void tableRows( int[] justification, boolean grid )
{
+this.tableRows = true;
+
this.cellJustif = justification;
this.isCellJustif = true;
@@ -1203,6 +1224,7 @@
/** {...@inheritdoc} */
public void tableRows_()
{
+this.tableRows = false;
this.cellJustif = null;
this.isCellJustif = false;
@@ -1217,6 +1239,11 @@
*/
public void tableRow()
{
+// To be backward compatible
+if ( !this.tableRows )
+{
+tableRows( null, false );
+}
tableRow( null );
}
svn commit: r749017 - in /maven/plugins/branches: maven-site-plugin-doxia-1.1/ maven-site-plugin-doxia-beta-1/
Author: hboutemy Date: Sun Mar 1 12:44:12 2009 New Revision: 749017 URL: http://svn.apache.org/viewvc?rev=749017view=rev Log: renamed branch to match Doxia new name: 1.1 instead of 1.0-beta-1 Added: maven/plugins/branches/maven-site-plugin-doxia-1.1/ - copied from r749016, maven/plugins/branches/maven-site-plugin-doxia-beta-1/ Removed: maven/plugins/branches/maven-site-plugin-doxia-beta-1/
svn commit: r749018 - /maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: bentmann
Date: Sun Mar 1 12:45:00 2009
New Revision: 749018
URL: http://svn.apache.org/viewvc?rev=749018view=rev
Log:
[MNG-2921] ejb-client dependency no longer resolved in reactor build
o Fixed regression introduced by misplaced else block in r742799
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=749018r1=749017r2=749018view=diff
==
---
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Sun Mar 1 12:45:00 2009
@@ -1797,40 +1797,17 @@
{
if ( attached.getFile() != null
attached.getFile().exists() )
{
-/* TODO: if I use the original, I get an exception
below:
-java.lang.UnsupportedOperationException:
Cannot change the download information for an attached artifact. It is derived
from the main artifact.
-at
org.apache.maven.project.artifact.AttachedArtifact.setDownloadUrl(AttachedArtifact.java:89)
-at
org.apache.maven.project.artifact.MavenMetadataSource.retrieve(MavenMetadataSource.java:205)
-at
org.apache.maven.artifact.resolver.DefaultArtifactCollector.recurse(DefaultArtifactCollector.java:275)
-at
org.apache.maven.artifact.resolver.DefaultArtifactCollector.collect(DefaultArtifactCollector.java:67)
-at
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:223)
-at
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:211)
-at
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:182)
-at
org.apache.maven.plugin.DefaultPluginManager.resolveTransitiveDependencies(DefaultPluginManager.java:1117)
-at
org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:366)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:534)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:475)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:454)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:306)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:273)
-at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:140)
-at
org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:322)
-at
org.apache.maven.DefaultMaven.execute(DefaultMaven.java:115)
-at
org.apache.maven.cli.MavenCli.main(MavenCli.java:256)
-*/
-
Artifact resultArtifact =
ArtifactUtils.copyArtifact( attached );
resultArtifact.setScope( pluginArtifact.getScope()
);
-
+
return resultArtifact;
}
+else
+{
+logMissingSiblingProjectArtifact( pluginArtifact );
+break;
+}
}
-else
-{
-logMissingSiblingProjectArtifact( pluginArtifact );
-}
-
-break;
}
}
}
svn commit: r748997 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-api/src/custom-rule-sample/ enforcer-api/src/custom-rule-sample/src/ enforcer-rules/ enforcer-rules/src/it/requirePluginsRepor
Author: bentmann Date: Sun Mar 1 11:08:01 2009 New Revision: 748997 URL: http://svn.apache.org/viewvc?rev=748997view=rev Log: o Used http://maven.apache.org/xsd/* for schema location Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/it/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=748997r1=748996r2=748997view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Sun Mar 1 11:08:01 2009 @@ -18,7 +18,7 @@ * under the License. * -- -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml?rev=748997r1=748996r2=748997view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml Sun Mar 1 11:08:01 2009 @@ -1,5 +1,5 @@ ?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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion groupIdcustom-rule/groupId artifactIdcustom-rule-sample/artifactId Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml?rev=748997r1=748996r2=748997view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml Sun Mar 1 11:08:01 2009 @@ -1,4 +1,4 @@ -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin-it1/artifactId Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml?rev=748997r1=748996r2=748997view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml Sun Mar 1 11:08:01 2009 @@ -1,4 +1,4 @@ -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; +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin-sample-usage/artifactId Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=748997r1=748996r2=748997view=diff
svn commit: r749022 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 12:57:45 2009 New Revision: 749022 URL: http://svn.apache.org/viewvc?rev=749022view=rev Log: [MSHARED-90] Upgrade to Doxia Sitetools 1.0 Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749022r1=749021r2=749022view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 12:57:45 2009 @@ -51,7 +51,7 @@ /issueManagement properties -doxiaSitetoolsVersion1.0-SNAPSHOT/doxiaSitetoolsVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion mavenVersion2.0.6/mavenVersion /properties
svn commit: r749028 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 13:07:39 2009 New Revision: 749028 URL: http://svn.apache.org/viewvc?rev=749028view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749028r1=749027r2=749028view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 13:07:39 2009 @@ -30,7 +30,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.2/version + version1.0.3-SNAPSHOT/version nameMaven Doxia Integration Tools/name descriptionA collection of tools to help the integration of Doxia in Maven plugins./description @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-doxia-tools-1.0.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools//url /scm issueManagement
svn commit: r749029 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Author: vsiveton
Date: Sun Mar 1 13:11:03 2009
New Revision: 749029
URL: http://svn.apache.org/viewvc?rev=749029view=rev
Log:
o improved warranty msg
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=749029r1=749028r2=749029view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Sun Mar 1 13:11:03 2009
@@ -584,13 +584,15 @@
if ( getLog().isWarnEnabled() )
{
-getLog().warn( EOL );
-getLog().warn( WARRANTY DISCLAIMER );
-getLog().warn( EOL );
+getLog().warn( );
+getLog().warn( WARRANTY DISCLAIMER );
+getLog().warn( );
getLog().warn( All warranties with regard to this Maven goal are
disclaimed! );
+getLog().warn( The changes will be done directly in the source
code. );
getLog().warn(
- The Maven Team strongly recommends the use of a
SCM software BEFORE executing
- + this goal. );
+ The Maven Team strongly recommends the use of a
SCM software BEFORE executing this
+ + goal. );
+getLog().warn( );
}
while ( true )
svn commit: r749032 - in /maven/plugins/trunk/maven-javadoc-plugin: ./ src/main/java/org/apache/maven/plugin/javadoc/ src/site/apt/examples/
Author: vsiveton Date: Sun Mar 1 13:20:27 2009 New Revision: 749032 URL: http://svn.apache.org/viewvc?rev=749032view=rev Log: o bump to 2.6 instead of 2.5.1 Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorJavadocJar.java maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorTestJavadocJar.java maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=749032r1=749031r2=749032view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Mar 1 13:20:27 2009 @@ -30,7 +30,7 @@ /parent artifactIdmaven-javadoc-plugin/artifactId - version2.5.1-SNAPSHOT/version + version2.6-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Javadoc Plugin/name Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=749032r1=749031r2=749032view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Sun Mar 1 13:20:27 2009 @@ -90,7 +90,7 @@ * * @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a * @version $Id$ - * @since 2.5.1 + * @since 2.6 */ public abstract class AbstractFixJavadocMojo extends AbstractMojo Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorJavadocJar.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorJavadocJar.java?rev=749032r1=749031r2=749032view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorJavadocJar.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorJavadocJar.java Sun Mar 1 13:20:27 2009 @@ -24,7 +24,7 @@ * using the standard a href=http://java.sun.com/j2se/javadoc/;Javadoc Tool/a. * * @version $Id$ - * @since 2.5.1 + * @since 2.6 * @goal aggregate-jar * @phase package * @aggregator Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorTestJavadocJar.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorTestJavadocJar.java?rev=749032r1=749031r2=749032view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorTestJavadocJar.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AggregatorTestJavadocJar.java Sun Mar 1 13:20:27 2009 @@ -24,7 +24,7 @@ * using the standard a href=http://java.sun.com/j2se/javadoc/;Javadoc Tool/a. * * @version $Id$ - * @since 2.5.1 + * @since 2.6 * @goal test-aggregate-jar * @phase package * @aggregator Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java?rev=749032r1=749031r2=749032view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java Sun Mar 1 13:20:27 2009 @@ -27,7 +27,7 @@ * * @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a * @version $Id$ - * @since 2.5.1 + * @since 2.6 * @goal fix *
svn commit: r749026 - /maven/shared/trunk/maven-doxia-tools/pom.xml
Author: dennisl Date: Sun Mar 1 13:06:48 2009 New Revision: 749026 URL: http://svn.apache.org/viewvc?rev=749026view=rev Log: [maven-release-plugin] prepare release maven-doxia-tools-1.0.2 Modified: maven/shared/trunk/maven-doxia-tools/pom.xml Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=749026r1=749025r2=749026view=diff == --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Sun Mar 1 13:06:48 2009 @@ -30,7 +30,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.0.2-SNAPSHOT/version + version1.0.2/version nameMaven Doxia Integration Tools/name descriptionA collection of tools to help the integration of Doxia in Maven plugins./description @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools//developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-doxia-tools-1.0.2/url /scm issueManagement
svn commit: r749024 - /maven/shared/trunk/
Author: dennisl Date: Sun Mar 1 13:00:54 2009 New Revision: 749024 URL: http://svn.apache.org/viewvc?rev=749024view=rev Log: o Add SVN properties for bugtraq Modified: maven/shared/trunk/ (props changed) Propchange: maven/shared/trunk/ -- bugtraq:logregex = MSHARED-\d+ Propchange: maven/shared/trunk/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/shared/trunk/ -- bugtraq:warnifnoissue = false
svn commit: r749027 - in /maven/shared/tags/maven-doxia-tools-1.0.2: ./ pom.xml
Author: dennisl Date: Sun Mar 1 13:07:19 2009 New Revision: 749027 URL: http://svn.apache.org/viewvc?rev=749027view=rev Log: [maven-release-plugin] copy for tag maven-doxia-tools-1.0.2 Added: maven/shared/tags/maven-doxia-tools-1.0.2/ - copied from r749023, maven/shared/trunk/maven-doxia-tools/ maven/shared/tags/maven-doxia-tools-1.0.2/pom.xml - copied unchanged from r749026, maven/shared/trunk/maven-doxia-tools/pom.xml
svn commit: r749031 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt
Author: vsiveton Date: Sun Mar 1 13:14:45 2009 New Revision: 749031 URL: http://svn.apache.org/viewvc?rev=749031view=rev Log: o propagation of r749029 in doc Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt?rev=749031r1=749030r2=749031view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/fix-javadocs.apt Sun Mar 1 13:14:45 2009 @@ -62,12 +62,12 @@ ... [INFO] [javadoc:fix] [WARNING] - -[WARNING] WARRANTY DISCLAIMER +[WARNING] WARRANTY DISCLAIMER [WARNING] - [WARNING] All warranties with regard to this Maven goal are disclaimed! +[WARNING] The changes will be done directly in the source code. [WARNING] The Maven Team strongly recommends the use of a SCM software BEFORE executing this goal. +[WARNING] [INFO] Are you sure to proceed? [Y]es [N]o y [INFO] OK, let's proceed...
svn commit: r749035 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sun Mar 1 14:06:04 2009 New Revision: 749035 URL: http://svn.apache.org/viewvc?rev=749035view=rev Log: [MSITE-101] schedule and release doxia 1.0 o Update to released version of Doxia Sitetools 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=749035r1=749034r2=749035view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 1 14:06:04 2009 @@ -158,7 +158,7 @@ properties doxiaVersion1.0/doxiaVersion -doxiaSitetoolsVersion1.0-SNAPSHOT/doxiaSitetoolsVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion wagonVersion1.0-beta-4/wagonVersion /properties
svn commit: r749038 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl
Date: Sun Mar 1 14:19:11 2009
New Revision: 749038
URL: http://svn.apache.org/viewvc?rev=749038view=rev
Log:
o Add a mavenVersion property to hold the version for Maven core dependencies
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=749038r1=749037r2=749038view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Mar 1 14:19:11 2009
@@ -159,6 +159,7 @@
properties
doxiaVersion1.0/doxiaVersion
doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion
+mavenVersion2.0.6/mavenVersion
wagonVersion1.0-beta-4/wagonVersion
/properties
@@ -167,37 +168,37 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact-manager/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
!-- Doxia --
svn commit: r749046 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/ site/apt/ test/java/org/apache/maven/plugin/ear/it/ test/resources/projects/project-056/ test
Author: snicoll
Date: Sun Mar 1 15:37:29 2009
New Revision: 749046
URL: http://svn.apache.org/viewvc?rev=749046view=rev
Log:
MEAR-100: Activated altDeploymentDescriptor for 1.3 and 1.4
Added:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-056/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-056/expected-META-INF/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-056/expected-META-INF/application.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-056/pom.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=749046r1=749045r2=749046view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
Sun Mar 1 15:37:29 2009
@@ -206,8 +206,6 @@
* to the application's root directory.
*
* @return the alternative deployment descriptor for this module
- *
- * @since JavaEE 5
*/
public String getAltDeploymentDescriptor()
{
@@ -231,16 +229,16 @@
/**
* Writes the alternative deployment descriptor if necessary.
- * p/
- * Only writes it if the descriptor is specified and version is JavaEE 5.
*
- * @param writer the writer to use
+ * @param writer the writer to use
* @param version the java EE version in use
*/
-protected void writeAltDeploymentDescriptor( XMLWriter writer, String
version) {
-if (GenerateApplicationXmlMojo.VERSION_5.equals(version)
getAltDeploymentDescriptor() != null) {
-writer.startElement( ALT_DD);
-writer.writeText( getAltDeploymentDescriptor());
+protected void writeAltDeploymentDescriptor( XMLWriter writer, String
version )
+{
+if ( getAltDeploymentDescriptor() != null )
+{
+writer.startElement( ALT_DD );
+writer.writeText( getAltDeploymentDescriptor() );
writer.endElement();
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt?rev=749046r1=749045r2=749046view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt Sun Mar 1
15:37:29 2009
@@ -111,7 +111,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* {ejbModule} Properties
@@ -145,7 +145,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* {jarModule} Properties
@@ -179,7 +179,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* includeInApplicationXml - set to true to if you want to generate an
entry
of this module in application.xml. Default is false.
@@ -216,7 +216,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* {rarModule} Properties
@@ -250,7 +250,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* {sarModule} Properties
@@ -315,7 +315,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* contextRoot - sets the context root of this web artifact.
@@ -351,7 +351,7 @@
to its uri. Default is false.
* altDeploymentDescriptor - sets the alternative deployment descriptor
for
- this module. (Java EE5).
+ this module.
* {harModule} Properties
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
URL:
svn commit: r749053 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Author: dennisl
Date: Sun Mar 1 16:23:33 2009
New Revision: 749053
URL: http://svn.apache.org/viewvc?rev=749053view=rev
Log:
[MSITE-320] Reference documentation
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=749053r1=749052r2=749053view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Sun Mar 1 16:23:33 2009
@@ -40,6 +40,12 @@
navigation.xml file has been replaced by the site descriptor in Maven
2.
The format is nearly the same, so you can probably reuse most of your old
file.
+ There is also an
+
{{{http://maven.apache.org/doxia/doxia-sitetools-1.0.x/doxia-decoration-model/decoration.html}XML
Schema Reference for the site descriptor}}
+ available.
+
+ The XML Schema for the site descriptor is published at
{{http://maven.apache.org/xsd/decoration-1.0.0.xsd}}.
+
* Title
The title of each generated page will be a combination of the site title
svn commit: r749060 - in /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository: LegacyMavenRepositorySystem.java MavenRepositorySystem.java
Author: jvanzyl
Date: Sun Mar 1 16:51:22 2009
New Revision: 749060
URL: http://svn.apache.org/viewvc?rev=749060view=rev
Log:
o Fix compilation error with mirrors
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=749060r1=749059r2=749060view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Sun Mar 1 16:51:22 2009
@@ -91,6 +91,9 @@
private ArtifactMetadataSource artifactMetadataSource;
@Requirement
+private MirrorBuilder mirrorBuilder;
+
+@Requirement
private Logger logger;
private static HashMapString, Artifact cache = new HashMapString,
Artifact();
@@ -626,4 +629,11 @@
{
return artifactMetadataSource.retrieveRelocatedArtifact( artifact,
localRepository, remoteRepositories );
}
+
+// Mirror
+
+public void addMirror( String id, String mirrorOf, String url )
+{
+mirrorBuilder.addMirror( id, mirrorOf, url );
+}
}
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=749060r1=749059r2=749060view=diff
==
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Sun Mar 1 16:51:22 2009
@@ -127,4 +127,8 @@
void addAuthenticationInfo( String repositoryId, String username, String
password, String privateKey, String passphrase );
void addPermissionInfo( String repositoryId, String filePermissions,
String directoryPermissions );
+
+// Mirrors
+
+void addMirror( String id, String mirrorOf, String url );
}
svn commit: r749066 - /maven/components/trunk/maven-compat/compatibility.cfl
Author: bentmann Date: Sun Mar 1 17:48:04 2009 New Revision: 749066 URL: http://svn.apache.org/viewvc?rev=749066view=rev Log: o Set svn:eol-style=native Modified: maven/components/trunk/maven-compat/compatibility.cfl (props changed) Propchange: maven/components/trunk/maven-compat/compatibility.cfl -- svn:eol-style = native
svn commit: r749068 - /maven/components/trunk/maven-compat/compatibility.cfl
Author: bentmann Date: Sun Mar 1 18:08:55 2009 New Revision: 749068 URL: http://svn.apache.org/viewvc?rev=749068view=rev Log: o Mentioned dropped support for uniqueVersion=false as per r747652 Modified: maven/components/trunk/maven-compat/compatibility.cfl Modified: maven/components/trunk/maven-compat/compatibility.cfl URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/compatibility.cfl?rev=749068r1=749067r2=749068view=diff == --- maven/components/trunk/maven-compat/compatibility.cfl (original) +++ maven/components/trunk/maven-compat/compatibility.cfl Sun Mar 1 18:08:55 2009 @@ -61,4 +61,9 @@ h2. Changes to the CLI * Log file support has been added i.e mvn -l log.txt clean install -* Plugin registry option has not been supported in the core and it lagged around in the CLI \ No newline at end of file +* Plugin registry option has not been supported in the core and it lagged around in the CLI + +h2. Repositories + +Support for non-unique SNAPSHOT deployments will be dropped. +
svn commit: r749069 - /maven/components/trunk/maven-compat/compatibility.cfl
Author: bentmann Date: Sun Mar 1 18:17:39 2009 New Revision: 749069 URL: http://svn.apache.org/viewvc?rev=749069view=rev Log: o Mentioned dropped support for profiles.xml as per r748226 Modified: maven/components/trunk/maven-compat/compatibility.cfl Modified: maven/components/trunk/maven-compat/compatibility.cfl URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/compatibility.cfl?rev=749069r1=749068r2=749069view=diff == --- maven/components/trunk/maven-compat/compatibility.cfl (original) +++ maven/components/trunk/maven-compat/compatibility.cfl Sun Mar 1 18:17:39 2009 @@ -67,3 +67,6 @@ Support for non-unique SNAPSHOT deployments will be dropped. +h2. Profiles + +Support for the profiles.xml will be dropped.
svn commit: r749076 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/ resources-project-builder/pom-encoding/ resources-project-builder/pom-encoding/latin-1/ resource
Author: bentmann
Date: Sun Mar 1 19:14:05 2009
New Revision: 749076
URL: http://svn.apache.org/viewvc?rev=749076view=rev
Log:
[MNG-2254] the encoding parameter in xml declaration of POM is ignored
o Added UT
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/utf-8/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml
(with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=749076r1=749075r2=749076view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Sun Mar 1 19:14:05 2009
@@ -881,6 +881,15 @@
}
//*/
+public void testPomEncoding()
+throws Exception
+{
+PomTestWrapper pom = buildPom( pom-encoding/utf-8 );
+assertEquals( TEST-CHARS: \u00DF\u0131\u03A3\u042F\u05D0\u20AC,
pom.getValue( description ) );
+pom = buildPom( pom-encoding/latin-1 );
+assertEquals( TEST-CHARS:
\u00C4\u00D6\u00DC\u00E4\u00F6\u00FC\u00DF, pom.getValue( description ) );
+}
+
private void assertPathWithNormalizedFileSeparators( Object value )
{
assertEquals( new File( value.toString() ).getPath(), value.toString()
);
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/
--
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/
--
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/
--
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/
--
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/
--
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/
--
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml?rev=749076view=auto
==
---
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
Sun Mar 1 19:14:05 2009
@@ -0,0 +1,36 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+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
+
+
svn commit: r749080 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2861/MNG-2861/ resources/mng-2861/MNG-2861/A/ resources/mng-2861/MNG-2861
Author: bentmann Date: Sun Mar 1 19:53:41 2009 New Revision: 749080 URL: http://svn.apache.org/viewvc?rev=749080view=rev Log: o Moved IT artifacts into group id for issue nubmer Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/ - copied from r748989, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/ - copied from r748989, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/ Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.jar.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.jar.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.jar.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.jar.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/maven-metadata.xml.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/maven-metadata.xml.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.jar.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.jar.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom.sha1 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/maven-metadata.xml.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/maven-metadata.xml.sha1 Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
svn commit: r749083 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2861/MNG-2861/ resources/mng-2861/MNG-2861/A/ resources/mng-2861/MNG-2861
Author: bentmann Date: Sun Mar 1 20:22:47 2009 New Revision: 749083 URL: http://svn.apache.org/viewvc?rev=749083view=rev Log: o Decoupled IT from production plugins Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/src/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/src/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/src/ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java?rev=749083r1=749082r2=749083view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java Sun Mar 1 20:22:47 2009 @@ -23,6 +23,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.List; public class MavenITmng2861RelocationsAndRangesTest extends AbstractMavenIntegrationTestCase @@ -39,9 +40,16 @@ File testDir = ResourceExtractor.simpleExtractResources( getClass(), /mng-2861 ); Verifier verifier = new Verifier( new File( testDir, MNG-2861 ).getAbsolutePath() ); +verifier.setAutoclean( false ); +verifier.deleteDirectory( A/target ); verifier.deleteArtifacts( org.apache.maven.its.mng2861 ); -verifier.executeGoal( install ); +verifier.executeGoal( validate ); verifier.verifyErrorFreeLog(); + +List artifacts = verifier.loadLines( A/target/artifacts.txt, UTF-8 ); +assertTrue( artifacts.toString(), artifacts.contains( org.apache.maven.its.mng2861:B:jar:1.0-SNAPSHOT ) ); +assertTrue( artifacts.toString(), artifacts.contains( org.apache.maven.its.mng2861.new:project:jar:2.0 ) ); +assertTrue( artifacts.toString(), artifacts.contains( org.apache.maven.its.mng2861:C:jar:1.0-SNAPSHOT ) ); } } Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml?rev=749083r1=749082r2=749083view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml Sun Mar 1 20:22:47 2009 @@ -39,4 +39,26 @@ /snapshots /repository /repositories + + build +plugins + plugin +groupIdorg.apache.maven.its.plugins/groupId +artifactIdmaven-it-plugin-dependency-resolution/artifactId +version2.1-SNAPSHOT/version +executions + execution +idtest/id +phasevalidate/phase +goals + goaltest/goal +/goals +configuration + testArtifactstarget/artifacts.txt/testArtifacts +/configuration + /execution +/executions + /plugin +/plugins + /build /project Modified:
svn commit: r749085 - /maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Author: jvanzyl Date: Sun Mar 1 20:30:49 2009 New Revision: 749085 URL: http://svn.apache.org/viewvc?rev=749085view=rev Log: o use internal method, not the artifact resolver Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=749085r1=749084r2=749085view=diff == --- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original) +++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Sun Mar 1 20:30:49 2009 @@ -454,7 +454,7 @@ projectArtifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getScope() ); } -artifactResolver.resolve( projectArtifact, remoteArtifactRepositories, localRepository ); +resolve( projectArtifact, localRepository, remoteArtifactRepositories ); File file = projectArtifact.getFile(); artifact.setFile( file );
svn commit: r749086 - /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
Author: jvanzyl
Date: Sun Mar 1 20:35:02 2009
New Revision: 749086
URL: http://svn.apache.org/viewvc?rev=749086view=rev
Log:
o adding default constructor and one for the single artifact resolution request.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=749086r1=749085r2=749086view=diff
==
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
Sun Mar 1 20:35:02 2009
@@ -44,6 +44,17 @@
private ListConflictResolver conflictResolvers;
+public ArtifactResolutionRequest()
+{
+}
+
+public ArtifactResolutionRequest( Artifact artifact, ArtifactRepository
localRepository, ListArtifactRepository remoteRepositories )
+{
+this.artifact = artifact;
+this.localRepository = localRepository;
+this.remoteRepostories = remoteRepositories;
+}
+
public Artifact getArtifact()
{
return artifact;
svn commit: r749093 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java resources/mng-2883/dependency/pom.xml resources
Author: bentmann
Date: Sun Mar 1 20:44:00 2009
New Revision: 749093
URL: http://svn.apache.org/viewvc?rev=749093view=rev
Log:
o Decoupled IT from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java?rev=749093r1=749092r2=749093view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
Sun Mar 1 20:44:00 2009
@@ -61,6 +61,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( target );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
File settings = verifier.filterFile( ../settings-template.xml,
settings.xml, UTF-8,
verifier.newDefaultFilterProperties() );
@@ -77,7 +78,7 @@
{
verifier.setLogFileName( log-parent-a.txt );
// this will ensure that all relevant plugins are present.
-verifier.executeGoal( initialize );
+verifier.executeGoal( validate );
}
catch ( VerificationException e )
{
@@ -91,15 +92,15 @@
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( log-parent-b.txt );
-verifier.executeGoal( initialize );
+verifier.executeGoal( validate );
// clear out the parent POM if it's in the local repository.
-verifier.deleteArtifact( org.apache.maven.its.mng2883, parent,
1.0-SNAPSHOT, pom );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
try
{
verifier.setLogFileName( log-parent-c.txt );
-verifier.executeGoal( initialize );
+verifier.executeGoal( validate );
fail( Build should fail with unresolvable parent POM. );
}
@@ -159,6 +160,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( target );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
List cliOptions = new ArrayList();
@@ -176,7 +178,7 @@
{
verifier.setLogFileName( log-dep-a.txt );
// this will ensure that all relevant plugins are present.
-verifier.executeGoal( compile );
+verifier.executeGoal( validate );
}
catch ( VerificationException e )
{
@@ -190,16 +192,15 @@
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( log-dep-b.txt );
-verifier.executeGoal( compile );
+verifier.executeGoal( validate );
// clear out the dependency if it's in the local repository.
-verifier.deleteArtifact( org.apache.maven.its.mng2883, dep,
1.0-SNAPSHOT, pom );
-verifier.deleteArtifact( org.apache.maven.its.mng2883, dep,
1.0-SNAPSHOT, jar );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
try
{
verifier.setLogFileName( log-dep-c.txt );
-verifier.executeGoal( compile );
+verifier.executeGoal( validate );
fail( Build should fail with unresolvable dependency artifact. );
}
@@ -261,6 +262,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( target );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
List cliOptions = new ArrayList();
@@ -286,8 +288,7 @@
verifier.executeGoal(
org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run );
// clear out the dependency if it's in the local repository.
-verifier.deleteArtifact( org.apache.maven.its.mng2883, plugin,
1.0-SNAPSHOT, pom );
-verifier.deleteArtifact( org.apache.maven.its.mng2883, plugin,
1.0-SNAPSHOT, jar );
+verifier.deleteArtifacts( org.apache.maven.its.mng2883 );
try
{
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
URL:
svn commit: r749127 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2926/ resources/mng-2926/repo/ resources/mng-2926/repo/org/ resources/mng
Author: bentmann Date: Sun Mar 1 22:03:52 2009 New Revision: 749127 URL: http://svn.apache.org/viewvc?rev=749127view=rev Log: o Decoupled IT from production plugins Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/mng-2926/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/mng-2926/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/mng-2926/0.1/mng-2926-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/mng-2926/0.1/mng-2926-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/its/mng2926/mng-2926/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/mng-2926/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/mng-2926/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/mng-2926/0.1/mng-2926-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/mng-2926/0.1/mng-2926-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/apache/maven/plugins/mng-2926/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/mng-2926/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/mng-2926/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/mng-2926/0.1/mng-2926-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/mng-2926/0.1/mng-2926-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/repo/org/codehaus/mojo/mng-2926/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/settings-custom.xml - copied, changed from r749093, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-project/settings.xml maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/settings-default.xml (contents, props changed) - copied, changed from r749093, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-project/settings-apache.xml Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/Readme.txt maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/test-project/ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/pom.xml Modified:
svn commit: r749132 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: snicoll
Date: Sun Mar 1 22:09:17 2009
New Revision: 749132
URL: http://svn.apache.org/viewvc?rev=749132view=rev
Log:
[maven-release-plugin] prepare release maven-ear-plugin-2.3.2
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=749132r1=749131r2=749132view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Mar 1 22:09:17 2009
@@ -19,8 +19,7 @@
under the License.
--
-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;
+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;
modelVersion4.0.0/modelVersion
parent
@@ -30,7 +29,7 @@
/parent
artifactIdmaven-ear-plugin/artifactId
- version2.3.2-SNAPSHOT/version
+ version2.3.2/version
packagingmaven-plugin/packaging
nameMaven EAR Plugin/name
@@ -41,11 +40,11 @@
/prerequisites
scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin//connection
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.3.2/connection
developerConnection
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.3.2
/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin//url
+
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-ear-plugin-2.3.2/url
/scm
issueManagement
systemJIRA/system
@@ -129,9 +128,9 @@
configuration
tasks
copy
todir=${project.build.testOutputDirectory}/projects overwrite=true
- fileset dir=src/test/resources/projects
includes=**/pom.xml/
+ fileset dir=src/test/resources/projects
includes=**/pom.xml /
filterset
-filter token=project.version
value=${project.version}/
+filter token=project.version
value=${project.version} /
/filterset
/copy
/tasks
svn commit: r749133 - in /maven/plugins/tags/maven-ear-plugin-2.3.2: ./ pom.xml
Author: snicoll Date: Sun Mar 1 22:09:24 2009 New Revision: 749133 URL: http://svn.apache.org/viewvc?rev=749133view=rev Log: [maven-release-plugin] copy for tag maven-ear-plugin-2.3.2 Added: maven/plugins/tags/maven-ear-plugin-2.3.2/ - copied from r749047, maven/plugins/trunk/maven-ear-plugin/ maven/plugins/tags/maven-ear-plugin-2.3.2/pom.xml - copied unchanged from r749132, maven/plugins/trunk/maven-ear-plugin/pom.xml
svn commit: r749134 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: snicoll Date: Sun Mar 1 22:09:29 2009 New Revision: 749134 URL: http://svn.apache.org/viewvc?rev=749134view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=749134r1=749133r2=749134view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Mar 1 22:09:29 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-ear-plugin/artifactId - version2.3.2/version + version2.3.3-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven EAR Plugin/name @@ -40,11 +40,11 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.3.2/connection + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin//connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.3.2 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin/ /developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-ear-plugin-2.3.2/url + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin//url /scm issueManagement systemJIRA/system
svn commit: r749141 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3023/ resources/mng-3023/consumer/ resources/mng-3023/dependency/ resourc
Author: bentmann
Date: Sun Mar 1 22:30:36 2009
New Revision: 749141
URL: http://svn.apache.org/viewvc?rev=749141view=rev
Log:
o Decoupled IT from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/dependency/dependency-classes/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/dependency/dependency-classes/dependency-1.jar
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/dependency/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/consumer/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/dependency/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java?rev=749141r1=749140r2=749141view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
Sun Mar 1 22:30:36 2009
@@ -54,13 +54,14 @@
// First pass. Make sure the dependency cannot be resolved.
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
verifier.setLogFileName( log-a.txt );
verifier.deleteArtifacts( org.apache.maven.its.mng3023 );
try
{
-verifier.executeGoal( initialize );
+verifier.executeGoal( validate );
fail( Expected failure to resolve dependency artifact without at
least calling 'compile' phase. );
}
catch ( VerificationException e )
@@ -87,11 +88,12 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-3023 );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
verifier.setLogFileName( log-b.txt );
-
+verifier.deleteDirectory( consumer/target );
verifier.deleteArtifacts( org.apache.maven.its.mng3023 );
-verifier.executeGoal( compile );
+verifier.executeGoal( initialize );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -118,11 +120,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-3023 );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
verifier.deleteArtifacts( org.apache.maven.its.mng3023 );
+verifier.deleteDirectory( consumer/target );
verifier.setLogFileName( log-c-1.txt );
-verifier.executeGoal( install );
+verifier.executeGoal( generate-sources );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -130,8 +134,9 @@
assertTrue( compileClassPath.toString(), compileClassPath.contains(
dependency-1.jar ) );
assertFalse( compileClassPath.toString(), compileClassPath.contains(
dependency-classes ) );
+verifier.deleteDirectory( consumer/target );
verifier.setLogFileName( log-c-2.txt );
-verifier.executeGoal( initialize );
+verifier.executeGoal( validate );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/consumer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/consumer/pom.xml?rev=749141r1=749140r2=749141view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/consumer/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/consumer/pom.xml
Sun Mar 1 22:30:36 2009
@@ -1,13 +1,38 @@
+?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
+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
svn commit: r749187 - in /maven/mercury/trunk/mercury-transport: mercury-transport-file/ pom.xml
Author: ogusakov Date: Mon Mar 2 05:03:42 2009 New Revision: 749187 URL: http://svn.apache.org/viewvc?rev=749187view=rev Log: [MERCURY-96] - got rid of unused transport module Removed: maven/mercury/trunk/mercury-transport/mercury-transport-file/ Modified: maven/mercury/trunk/mercury-transport/pom.xml Modified: maven/mercury/trunk/mercury-transport/pom.xml URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=749187r1=749186r2=749187view=diff == --- maven/mercury/trunk/mercury-transport/pom.xml (original) +++ maven/mercury/trunk/mercury-transport/pom.xml Mon Mar 2 05:03:42 2009 @@ -34,7 +34,6 @@ modules modulemercury-transport-api/module modulemercury-transport-http/module -modulemercury-transport-file/module /modules dependencies
