From commitsclarson@example.org Sun Apr 01 13:24:40 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 42032 invoked from network); 1 Apr 2007 13:24:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 13:24:38 -0000 Received: (qmail 72065 invoked by uid 500); 1 Apr 2007 13:24:45 -0000 Delivered-To: clarson@example.org Received: (qmail 72012 invoked by uid 500); 1 Apr 2007 13:24:45 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 71993 invoked by uid 99); 1 Apr 2007 13:24:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 06:24:44 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 06:24:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 84A3C1A9838; Sun, 1 Apr 2007 06:24:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524590 - /maven/site/trunk/src/site/apt/release-notes.apt Date: Sun, 01 Apr 2007 13:24:16 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 06:24:15 2007 New Revision: 524590 URL: http://svn.apache.org/viewvc?view=rev&rev=524590 Log: o adding link to the roadmap Modified: maven/site/trunk/src/site/apt/release-notes.apt Modified: maven/site/trunk/src/site/apt/release-notes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/release-notes.apt?view=diff&rev=524590&r1=524589&r2=524590 ============================================================================== --- maven/site/trunk/src/site/apt/release-notes.apt (original) +++ maven/site/trunk/src/site/apt/release-notes.apt Sun Apr 1 06:24:15 2007 @@ -37,6 +37,9 @@ will align all transitive dependencies to versions specified in the dependencyManagement. To detect any problems that you might have you can refer to these {{{http://maven.apache.org/plugins/maven-dependency-plugin/examples/preparing-dependencies.html}notes}} to prepare for the upgrade. + + * The full list of changes can be found {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&&pid=10500&fixfor=13010&sorter/field=issuekey&sorter/order=DESC} + here}}. * 2.0.5 Release Notes From commitsclarson@example.org Sun Apr 01 13:36:47 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 45247 invoked from network); 1 Apr 2007 13:36:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 13:36:44 -0000 Received: (qmail 84649 invoked by uid 500); 1 Apr 2007 13:36:51 -0000 Delivered-To: clarson@example.org Received: (qmail 84607 invoked by uid 500); 1 Apr 2007 13:36:51 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 84594 invoked by uid 99); 1 Apr 2007 13:36:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 06:36:50 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 06:36:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DAB551A9838; Sun, 1 Apr 2007 06:36:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524592 - /maven/ant-tasks/trunk/pom.xml Date: Sun, 01 Apr 2007 13:36:22 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 06:36:22 2007 New Revision: 524592 URL: http://svn.apache.org/viewvc?view=rev&rev=524592 Log: o updating to use 2.0.6 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?view=diff&rev=524592&r1=524591&r2=524592 ============================================================================== --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Sun Apr 1 06:36:22 2007 @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> <exclusions> <exclusion> <artifactId>junit</artifactId> @@ -83,12 +83,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-error-diagnostics</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-settings</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -110,7 +110,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact-manager</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> <exclusions> <exclusion> <artifactId>junit</artifactId> @@ -126,7 +126,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> From commitsclarson@example.org Sun Apr 01 14:40:45 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 55943 invoked from network); 1 Apr 2007 14:40:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 14:40:44 -0000 Received: (qmail 39813 invoked by uid 500); 1 Apr 2007 14:40:51 -0000 Delivered-To: clarson@example.org Received: (qmail 39588 invoked by uid 500); 1 Apr 2007 14:40:51 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 39574 invoked by uid 99); 1 Apr 2007 14:40:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 07:40:51 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 07:40:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 02FDA1A9838; Sun, 1 Apr 2007 07:40:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524599 - in /maven/ant-tasks/trunk: sample.build.xml src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Date: Sun, 01 Apr 2007 14:40:22 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 07:40:22 2007 New Revision: 524599 URL: http://svn.apache.org/viewvc?view=rev&rev=524599 Log: MANTTASKS-28: Add the ability to downloads sources Modified: maven/ant-tasks/trunk/sample.build.xml maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Modified: maven/ant-tasks/trunk/sample.build.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?view=diff&rev=524599&r1=524598&r2=524599 ============================================================================== --- maven/ant-tasks/trunk/sample.build.xml (original) +++ maven/ant-tasks/trunk/sample.build.xml Sun Apr 1 07:40:22 2007 @@ -69,7 +69,7 @@ </target> <target name="foo" depends="initTaskDefs"> - <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset"> + <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset" sourcesFilesetId="sources.fileset"> <dependency groupId="org.apache.maven.wagon" artifactId="wagon-provider-test" version="1.0-alpha-4"> <exclusion groupId="junit" artifactId="junit"/> </dependency> @@ -85,6 +85,10 @@ <copy todir="target/files"> <fileset refid="dependency.fileset"/> </copy> + <copy todir="target/files/sources"> + <fileset refid="sources.fileset"/> + </copy> + <artifact:dependencies filesetId="my.dependency.fileset" verbose="true"> <pom refid="maven.project"/> @@ -212,7 +216,7 @@ <artifact:deploy file="sample-build-test.pom"> <pom file="sample-build-test.pom" /> <remoteRepository refid="deploy.repository" /> - </artifact:deploy> + </artifact:deploy> </target> </project> Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?view=diff&rev=524599&r1=524598&r2=524599 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Sun Apr 1 07:40:22 2007 @@ -64,6 +64,8 @@ private String filesetId; + private String sourcesFilesetId; + private String useScope; private String type; @@ -117,6 +119,13 @@ ArtifactResolutionResult result; Set artifacts; + List remoteRepositories = getRemoteRepositories(); + + RemoteRepository remoteRepository = getDefaultRemoteRepository(); + remoteRepositories.add( remoteRepository ); + + List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories ); + try { artifacts = MavenMetadataSource.createArtifacts( artifactFactory, dependencies, null, null, null ); @@ -130,13 +139,6 @@ listeners = Collections.singletonList( new AntResolutionListener( getProject() ) ); } - List remoteRepositories = getRemoteRepositories(); - - RemoteRepository remoteRepository = getDefaultRemoteRepository(); - remoteRepositories.add( remoteRepository ); - - List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories ); - // TODO: managed dependencies Map managedDependencies = Collections.EMPTY_MAP; @@ -187,12 +189,23 @@ throw new BuildException( "Reference ID " + filesetId + " already exists" ); } + if ( sourcesFilesetId != null && getProject().getReference( sourcesFilesetId ) != null ) + { + throw new BuildException( "Reference ID " + sourcesFilesetId + " already exists" ); + } + FileList fileList = new FileList(); fileList.setDir( getLocalRepository().getLocation() ); FileSet fileSet = new FileSet(); fileSet.setDir( fileList.getDir( getProject() ) ); + FileList sourcesFileList = new FileList(); + sourcesFileList.setDir( getLocalRepository().getLocation() ); + + FileSet sourcesFileSet = new FileSet(); + sourcesFileSet.setDir( sourcesFileList.getDir( getProject() ) ); + if ( result.getArtifacts().isEmpty() ) { fileSet.createExclude().setName( "**/**" ); @@ -210,6 +223,37 @@ fileList.addConfiguredFile( file ); fileSet.createInclude().setName( filename ); + + if ( sourcesFilesetId != null ) + { + // get sources + Artifact sourcesArtifact = + artifactFactory.createArtifactWithClassifier( artifact.getGroupId(), artifact.getArtifactId(), + artifact.getVersion(), "java-source", "sources" ); + if ( sourcesArtifact != null ) + { + try + { + resolver.resolve( sourcesArtifact, remoteArtifactRepositories, localRepo ); + String sourcesFilename = localRepo.pathOf( sourcesArtifact ); + + FileList.FileName sourcesFile = new FileList.FileName(); + sourcesFile.setName( sourcesFilename ); + + sourcesFileList.addConfiguredFile( sourcesFile ); + + sourcesFileSet.createInclude().setName( sourcesFilename ); + } + catch ( ArtifactResolutionException e ) + { + throw new BuildException( "Unable to resolve artifact: " + e.getMessage(), e ); + } + catch ( ArtifactNotFoundException e ) + { + // no sources available: no problem + } + } + } } } @@ -224,6 +268,11 @@ { getProject().addReference( filesetId, fileSet ); } + + if ( sourcesFilesetId != null ) + { + getProject().addReference( sourcesFilesetId, sourcesFileSet ); + } } private List createRemoteArtifactRepositories( List remoteRepositories ) @@ -269,6 +318,16 @@ public String getFilesetId() { return filesetId; + } + + public void setSourcesFilesetId( String filesetId ) + { + this.sourcesFilesetId = filesetId; + } + + public String getSourcesFilesetId() + { + return sourcesFilesetId; } public void setFilesetId( String filesetId ) From commitsclarson@example.org Sun Apr 01 16:43:23 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 85427 invoked from network); 1 Apr 2007 16:43:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 16:43:21 -0000 Received: (qmail 57919 invoked by uid 500); 1 Apr 2007 16:43:28 -0000 Delivered-To: clarson@example.org Received: (qmail 57878 invoked by uid 500); 1 Apr 2007 16:43:28 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 57865 invoked by uid 99); 1 Apr 2007 16:43:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 09:43:28 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 09:43:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 479EF1A9838; Sun, 1 Apr 2007 09:42:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524627 - in /maven/ant-tasks/trunk: ./ src/main/java/org/apache/maven/artifact/ant/ src/main/resources/org/apache/maven/artifact/ant/ Date: Sun, 01 Apr 2007 16:42:58 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 09:42:55 2007 New Revision: 524627 URL: http://svn.apache.org/viewvc?view=rev&rev=524627 Log: MANTTASKS-42 Allow the use of attached artifacts Added: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java - copied unchanged from r524626, maven/sandbox/trunk/ant-tasks/install-deploy-attached/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java - copied unchanged from r524626, maven/sandbox/trunk/ant-tasks/install-deploy-attached/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java Modified: maven/ant-tasks/trunk/pom.xml (props changed) maven/ant-tasks/trunk/sample.build.xml maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java (contents, props changed) maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java maven/ant-tasks/trunk/src/main/resources/org/apache/maven/artifact/ant/antlib.xml (props changed) Propchange: maven/ant-tasks/trunk/pom.xml ('svn:executable' removed) Modified: maven/ant-tasks/trunk/sample.build.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/sample.build.xml (original) +++ maven/ant-tasks/trunk/sample.build.xml Sun Apr 1 09:42:55 2007 @@ -32,7 +32,7 @@ <artifact:localRepository id="local.repository" location="${basedir}/target/local-repo" layout="default"/> - <artifact:remoteRepository id="deploy.repository" url="file://localhost/${basedir}/target/deployment-repo" layout="legacy"/> + <artifact:remoteRepository id="deploy.repository" url="file://localhost/${basedir}/target/deployment-repo" layout="default"/> <artifact:pom file="pom.xml" id="maven.project"/> @@ -217,6 +217,26 @@ <pom file="sample-build-test.pom" /> <remoteRepository refid="deploy.repository" /> </artifact:deploy> + </target> + + <target name="test-deploy-attached" depends="initTaskDefs"> + <echo message="test" file="${basedir}/target/sample-build-test.pom.asc"/> + + <artifact:deploy file="sample-build-test.pom"> + <pom file="sample-build-test.pom" /> + <remoteRepository refid="deploy.repository" /> + <attach file="${basedir}/target/sample-build-test.pom.asc" type="pom.asc"/> + </artifact:deploy> + </target> + + <target name="test-install-attached" depends="initTaskDefs"> + <echo message="test" file="${basedir}/target/sample-build-test.pom.asc"/> + + <artifact:install file="sample-build-test.pom"> + <pom file="sample-build-test.pom" /> + <localRepository refid="local.repository"/> + <attach file="${basedir}/target/sample-build-test.pom.asc" type="pom.asc"/> + </artifact:install> </target> </project> Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.wagon.events.TransferEvent; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.wagon.authentication.AuthenticationInfo; Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; @@ -26,7 +29,7 @@ import org.apache.maven.project.artifact.ProjectArtifactMetadata; import org.apache.tools.ant.BuildException; -import java.io.File; +import java.util.Iterator; /** * Deploy task, using maven-artifact. @@ -35,14 +38,12 @@ * @version $Id$ */ public class DeployTask - extends AbstractArtifactTask + extends InstallDeployTaskSupport { private RemoteRepository remoteRepository; private RemoteRepository remoteSnapshotRepository; - private File file; - protected void doExecute() { ArtifactRepository localRepo = createLocalArtifactRepository(); @@ -121,6 +122,24 @@ throw new BuildException( "Error deploying artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e ); } + + // Deploy any attached artifacts + if (attachedArtifacts != null) { + Iterator iter = attachedArtifacts.iterator(); + + while (iter.hasNext()) { + AttachedArtifact attached = (AttachedArtifact)iter.next(); + Artifact attachedArtifact = createArtifactFromAttached(attached, artifact); + + try { + deployer.deploy( attachedArtifact.getFile(), attachedArtifact, deploymentRepository, localRepo ); + } + catch (ArtifactDeploymentException e) { + throw new BuildException( + "Error deploying attached artifact '" + attachedArtifact.getDependencyConflictId() + "': " + e.getMessage(), e ); + } + } + } } public RemoteRepository getRemoteRepository() @@ -136,15 +155,5 @@ public void addRemoteRepository( RemoteRepository remoteRepository ) { this.remoteRepository = remoteRepository; - } - - public File getFile() - { - return file; - } - - public void setFile( File file ) - { - this.file = file; } } Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java Sun Apr 1 09:42:55 2007 @@ -1,22 +1,26 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.installer.ArtifactInstaller; import org.apache.maven.artifact.metadata.ArtifactMetadata; @@ -26,6 +30,9 @@ import org.apache.tools.ant.BuildException; import java.io.File; +import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; /** * Install task, using maven-artifact. @@ -35,10 +42,8 @@ * @todo should be able to incorporate into the install mojo? */ public class InstallTask - extends AbstractArtifactTask + extends InstallDeployTaskSupport { - private File file; - protected void doExecute() { ArtifactRepository localRepo = createLocalArtifactRepository(); @@ -72,15 +77,23 @@ throw new BuildException( "Error installing artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e ); } - } - - public File getFile() - { - return file; - } - public void setFile( File file ) - { - this.file = file; + // Install any attached artifacts + if (attachedArtifacts != null) { + Iterator iter = attachedArtifacts.iterator(); + + while (iter.hasNext()) { + AttachedArtifact attached = (AttachedArtifact)iter.next(); + Artifact attachedArtifact = createArtifactFromAttached(attached, artifact); + + try { + installer.install( attachedArtifact.getFile(), attachedArtifact, localRepo ); + } + catch (ArtifactInstallationException e) { + throw new BuildException( + "Error installing attached artifact '" + attachedArtifact.getDependencyConflictId() + "': " + e.getMessage(), e ); + } + } + } } } Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.Artifact; Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import java.io.File; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.artifact.repository.ArtifactRepository; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.maven.wagon.proxy.ProxyInfo; Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /** Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.tools.ant.BuildException; Propchange: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java ('svn:executable' removed) Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java?view=diff&rev=524627&r1=524626&r2=524627 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java Sun Apr 1 09:42:55 2007 @@ -1,19 +1,22 @@ package org.apache.maven.artifact.ant; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import org.apache.tools.ant.ProjectComponent; Propchange: maven/ant-tasks/trunk/src/main/resources/org/apache/maven/artifact/ant/antlib.xml ('svn:executable' removed) From commitsclarson@example.org Sun Apr 01 16:51:01 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 88356 invoked from network); 1 Apr 2007 16:50:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 16:50:59 -0000 Received: (qmail 70001 invoked by uid 500); 1 Apr 2007 16:51:06 -0000 Delivered-To: clarson@example.org Received: (qmail 69951 invoked by uid 500); 1 Apr 2007 16:51:06 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 69938 invoked by uid 99); 1 Apr 2007 16:51:06 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 09:51:06 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 09:50:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1B6A31A983E; Sun, 1 Apr 2007 09:50:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524630 - /maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Date: Sun, 01 Apr 2007 16:50:38 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 09:50:37 2007 New Revision: 524630 URL: http://svn.apache.org/viewvc?view=rev&rev=524630 Log: MANTTASKS-31 Allow custom location for settings.xml file Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=524630&r1=524629&r2=524630 ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Apr 1 09:50:37 2007 @@ -181,29 +181,7 @@ if ( settingsFile.exists() ) { - FileReader reader = null; - try - { - reader = new FileReader( settingsFile ); - - SettingsXpp3Reader modelReader = new SettingsXpp3Reader(); - - settings = modelReader.read( reader ); - } - catch ( IOException e ) - { - log( "Error reading settings file '" + settingsFile + "' - ignoring. Error was: " + e.getMessage(), - Project.MSG_WARN ); - } - catch ( XmlPullParserException e ) - { - log( "Error parsing settings file '" + settingsFile + "' - ignoring. Error was: " + e.getMessage(), - Project.MSG_WARN ); - } - finally - { - IOUtil.close( reader ); - } + loadSettings(settingsFile); } if ( StringUtils.isEmpty( settings.getLocalRepository() ) ) @@ -213,6 +191,38 @@ } } return settings; + } + + private void loadSettings(File settingsFile) { + FileReader reader = null; + try + { + reader = new FileReader( settingsFile ); + + SettingsXpp3Reader modelReader = new SettingsXpp3Reader(); + + settings = modelReader.read( reader ); + } + catch ( IOException e ) + { + log( "Error reading settings file '" + settingsFile + "' - ignoring. Error was: " + e.getMessage(), + Project.MSG_WARN ); + } + catch ( XmlPullParserException e ) + { + log( "Error parsing settings file '" + settingsFile + "' - ignoring. Error was: " + e.getMessage(), + Project.MSG_WARN ); + } + finally + { + IOUtil.close( reader ); + } + } + + public void setSettingsFile(File settingsFile) { + if (!settingsFile.exists()) throw new BuildException("settingsFile does not exist: " + settingsFile.getAbsolutePath()); + settings = new Settings(); + loadSettings(settingsFile); } protected RemoteRepository createAntRemoteRepository( org.apache.maven.model.Repository pomRepository ) From commitsclarson@example.org Sun Apr 01 17:03:07 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 90583 invoked from network); 1 Apr 2007 17:03:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:03:05 -0000 Received: (qmail 83735 invoked by uid 500); 1 Apr 2007 17:03:11 -0000 Delivered-To: clarson@example.org Received: (qmail 83650 invoked by uid 500); 1 Apr 2007 17:03:11 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 83637 invoked by uid 99); 1 Apr 2007 17:03:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:03:11 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:03:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 88CC51A9838; Sun, 1 Apr 2007 10:02:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524631 - /maven/ant-tasks/trunk/pom.xml Date: Sun, 01 Apr 2007 17:02:43 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:02:42 2007 New Revision: 524631 URL: http://svn.apache.org/viewvc?view=rev&rev=524631 Log: o making this 2.0.6-S to match the maven release it's based on 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?view=diff&rev=524631&r1=524630&r2=524631 ============================================================================== --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Sun Apr 1 10:02:42 2007 @@ -25,7 +25,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>maven-ant-tasks</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0.6-SNAPSHOT</version> <name>Maven Ant Task</name> <build> <plugins> From commitsclarson@example.org Sun Apr 01 17:05:49 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 90800 invoked from network); 1 Apr 2007 17:05:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:05:48 -0000 Received: (qmail 85305 invoked by uid 500); 1 Apr 2007 17:05:55 -0000 Delivered-To: clarson@example.org Received: (qmail 85258 invoked by uid 500); 1 Apr 2007 17:05:55 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 85241 invoked by uid 99); 1 Apr 2007 17:05:55 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:05:55 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:05:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9DF151A9838; Sun, 1 Apr 2007 10:05:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524632 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: ./ src/main/java/org/apache/maven/artifact/ant/ src/main/resources/org/apache/maven/artifact/ant/ Date: Sun, 01 Apr 2007 17:05:26 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:05:24 2007 New Revision: 524632 URL: http://svn.apache.org/viewvc?view=rev&rev=524632 Log: Creating a branch structure that mirrors what we are doing for Maven itself. Added: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/ - copied from r524625, maven/ant-tasks/trunk/ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml - copied unchanged from r524631, maven/ant-tasks/trunk/pom.xml maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml - copied unchanged from r524627, maven/ant-tasks/trunk/sample.build.xml maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java - copied unchanged from r524630, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Authentication.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Authentication.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DeployTask.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/InstallTask.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Proxy.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Proxy.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Repository.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Repository.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/RepositoryPolicy.java maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/resources/org/apache/maven/artifact/ant/antlib.xml - copied unchanged from r524627, maven/ant-tasks/trunk/src/main/resources/org/apache/maven/artifact/ant/antlib.xml From commitsclarson@example.org Sun Apr 01 17:06:59 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 91117 invoked from network); 1 Apr 2007 17:06:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:06:57 -0000 Received: (qmail 87063 invoked by uid 500); 1 Apr 2007 17:07:04 -0000 Delivered-To: clarson@example.org Received: (qmail 86828 invoked by uid 500); 1 Apr 2007 17:07:03 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 86815 invoked by uid 99); 1 Apr 2007 17:07:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:07:03 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:06:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E253D1A9838; Sun, 1 Apr 2007 10:06:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524633 - /maven/ant-tasks/trunk/pom.xml Date: Sun, 01 Apr 2007 17:06:35 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:06:35 2007 New Revision: 524633 URL: http://svn.apache.org/viewvc?view=rev&rev=524633 Log: o the trunk here will now match changes against 2.1-S 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?view=diff&rev=524633&r1=524632&r2=524633 ============================================================================== --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Sun Apr 1 10:06:35 2007 @@ -25,7 +25,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>maven-ant-tasks</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <name>Maven Ant Task</name> <build> <plugins> From commitsclarson@example.org Sun Apr 01 17:10:06 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 92113 invoked from network); 1 Apr 2007 17:10:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:10:05 -0000 Received: (qmail 89522 invoked by uid 500); 1 Apr 2007 17:10:12 -0000 Delivered-To: clarson@example.org Received: (qmail 89300 invoked by uid 500); 1 Apr 2007 17:10:11 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 89287 invoked by uid 99); 1 Apr 2007 17:10:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:10:11 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:10:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 80E981A9838; Sun, 1 Apr 2007 10:09:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524634 - /maven/ant-tasks/trunk/pom.xml Date: Sun, 01 Apr 2007 17:09:42 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:09:41 2007 New Revision: 524634 URL: http://svn.apache.org/viewvc?view=rev&rev=524634 Log: o add release plugin muck 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?view=diff&rev=524634&r1=524633&r2=524634 ============================================================================== --- maven/ant-tasks/trunk/pom.xml (original) +++ maven/ant-tasks/trunk/pom.xml Sun Apr 1 10:09:41 2007 @@ -28,6 +28,16 @@ <version>2.1-SNAPSHOT</version> <name>Maven Ant Task</name> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.apache.org/repos/asf/maven/ant-tasks/tags</tagBase> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <artifactId>shade-maven-plugin</artifactId> From commitsclarson@example.org Sun Apr 01 17:10:18 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 92225 invoked from network); 1 Apr 2007 17:10:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:10:15 -0000 Received: (qmail 89678 invoked by uid 500); 1 Apr 2007 17:10:22 -0000 Delivered-To: clarson@example.org Received: (qmail 89627 invoked by uid 500); 1 Apr 2007 17:10:22 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 89614 invoked by uid 99); 1 Apr 2007 17:10:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:10:22 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:10:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5280B1A983E; Sun, 1 Apr 2007 10:09:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524635 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Date: Sun, 01 Apr 2007 17:09:54 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:09:53 2007 New Revision: 524635 URL: http://svn.apache.org/viewvc?view=rev&rev=524635 Log: o add releases plugin muck Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml?view=diff&rev=524635&r1=524634&r2=524635 ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Sun Apr 1 10:09:53 2007 @@ -28,6 +28,16 @@ <version>2.0.6-SNAPSHOT</version> <name>Maven Ant Task</name> <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.apache.org/repos/asf/maven/ant-tasks/tags</tagBase> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <artifactId>shade-maven-plugin</artifactId> From commitsclarson@example.org Sun Apr 01 17:22:48 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 95614 invoked from network); 1 Apr 2007 17:22:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:22:47 -0000 Received: (qmail 1501 invoked by uid 500); 1 Apr 2007 17:22:54 -0000 Delivered-To: clarson@example.org Received: (qmail 1279 invoked by uid 500); 1 Apr 2007 17:22:53 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 1266 invoked by uid 99); 1 Apr 2007 17:22:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:22:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 10:22:45 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 65D371A9838; Sun, 1 Apr 2007 10:22:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524637 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Date: Sun, 01 Apr 2007 17:22:25 -0000 To: clarson@example.org From: clarson@example.org X-Mailer: svnmailer-1.1.0 Message-Id: <clarson@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Apr 1 10:22:24 2007 New Revision: 524637 URL: http://svn.apache.org/viewvc?view=rev&rev=524637 Log: [maven-release-plugin] prepare release maven-ant-tasks-2.0.6 Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml?view=diff&rev=524637&r1=524636&r2=524637 ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Sun Apr 1 10:22:24 2007 @@ -16,8 +16,7 @@ ~ 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/maven-v4_0_0.xsd"> <parent> <artifactId>maven-parent</artifactId> <groupId>org.apache.maven</groupId> @@ -25,7 +24,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>maven-ant-tasks</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.6</version> <name>Maven Ant Task</name> <build> <pluginManagement> @@ -149,4 +148,10 @@ <version>1.0-alpha-9-stable-1</version> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.0.6</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.0.6</developerConnection> + <url>https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.0.6</url> + </scm> </project> From commitsclarson@example.org Sun Apr 01 17:22:52 2007 Return-Path: <commitsclarson@example.org> Delivered-To: clarson@example.org Received: (qmail 95700 invoked from network); 1 Apr 2007 17:22:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2007 17:22:51 -0000 Received: (qmail 1600 invoked by uid 500); 1 Apr 2007 17:22:58 -0000 Delivered-To: clarson@example.org Received: (qmail 1566 invoked by uid 500); 1 Apr 2007 17:22:58 -0000 Mailing-List: contact clarson@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:clarson@example.org> List-Unsubscribe: <mailto:clarson@example.org> List-Post: <mailto:clarson@example.org> List-Id: <commits.maven.apache.org> Reply-To: clarson@example.org Delivered-To: mailing list clarson@example.org Received: (qmail 1549 invoked by uid 99); 1 Apr 2007 17:22:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun,
{'source': 'Apache Software Foundation Public Mail Archives'}