date:20111204

svn commit: r1210076 - in /maven/maven-3/trunk: ./ apache-maven/ maven-aether-provider/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ ma

2011-12-04 Thread olamy

Author: olamy
Date: Sun Dec  4 08:46:27 2011
New Revision: 1210076

URL: http://svn.apache.org/viewvc?rev=1210076view=rev
Log:
back to 3.0.4-SNAPSHOT

Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/maven-aether-provider/pom.xml
maven/maven-3/trunk/maven-artifact/pom.xml
maven/maven-3/trunk/maven-compat/pom.xml
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-embedder/pom.xml
maven/maven-3/trunk/maven-model-builder/pom.xml
maven/maven-3/trunk/maven-model/pom.xml
maven/maven-3/trunk/maven-plugin-api/pom.xml
maven/maven-3/trunk/maven-repository-metadata/pom.xml
maven/maven-3/trunk/maven-settings-builder/pom.xml
maven/maven-3/trunk/maven-settings/pom.xml
maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Sun Dec  4 08:46:27 2011
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdapache-maven/artifactId

Modified: maven/maven-3/trunk/maven-aether-provider/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-aether-provider/pom.xml (original)
+++ maven/maven-3/trunk/maven-aether-provider/pom.xml Sun Dec  4 08:46:27 2011
@@ -25,7 +25,7 @@ under the License.
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-aether-provider/artifactId

Modified: maven/maven-3/trunk/maven-artifact/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-artifact/pom.xml (original)
+++ maven/maven-3/trunk/maven-artifact/pom.xml Sun Dec  4 08:46:27 2011
@@ -16,7 +16,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-artifact/artifactId

Modified: maven/maven-3/trunk/maven-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-compat/pom.xml (original)
+++ maven/maven-3/trunk/maven-compat/pom.xml Sun Dec  4 08:46:27 2011
@@ -16,7 +16,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-compat/artifactId

Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Sun Dec  4 08:46:27 2011
@@ -16,7 +16,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-core/artifactId

Modified: maven/maven-3/trunk/maven-embedder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-embedder/pom.xml (original)
+++ maven/maven-3/trunk/maven-embedder/pom.xml Sun Dec  4 08:46:27 2011
@@ -16,7 +16,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent
 
   artifactIdmaven-embedder/artifactId

Modified: maven/maven-3/trunk/maven-model-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=1210076r1=1210075r2=1210076view=diff
==
--- maven/maven-3/trunk/maven-model-builder/pom.xml (original)
+++ maven/maven-3/trunk/maven-model-builder/pom.xml Sun Dec  4 08:46:27 2011
@@ -16,7 +16,7 @@
   parent
 groupIdorg.apache.maven/groupId
 artifactIdmaven/artifactId
-version3.0.5-SNAPSHOT/version
+version3.0.4-SNAPSHOT/version
   /parent

svn commit: r1210077 - /maven/maven-3/tags/maven-3.0.4/

2011-12-04 Thread olamy

Author: olamy
Date: Sun Dec  4 08:49:15 2011
New Revision: 1210077

URL: http://svn.apache.org/viewvc?rev=1210077view=rev
Log:
cancel release 


Removed:
maven/maven-3/tags/maven-3.0.4/

svn commit: r1210201 - /maven/site/trunk/src/site/apt/plugins/index.apt

2011-12-04 Thread krosenvold

Author: krosenvold
Date: Sun Dec  4 20:30:21 2011
New Revision: 1210201

URL: http://svn.apache.org/viewvc?rev=1210201view=rev
Log:
Upped surefire versions

Modified:
maven/site/trunk/src/site/apt/plugins/index.apt

Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1210201r1=1210200r2=1210201view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sun Dec  4 20:30:21 2011
@@ -70,7 +70,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-deploy-plugin/} deploy}} | B  | 
2.7  | 2011-08-24 | Deploy the built artifact to the remote repository. 
| 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-failsafe-plugin/} failsafe}} | B  | 
2.10 | 2011-09-30 | Run the JUnit integration tests in an isolated 
classloader. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-failsafe-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/plugins/maven-failsafe-plugin/} failsafe}} | B  | 
2.11 | 2011-12-04 | Run the JUnit integration tests in an isolated 
classloader. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-failsafe-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-install-plugin/} install}}   | B  | 
2.3.1| 2010-05-21 | Install the built artifact into the local 
repository. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
 
*--++--++--+++
@@ -80,7 +80,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-site-plugin/} site}} for Maven 2  3 | B  | 
3.0  | 2011-08-02 | Generate a site for the current project. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/branches/maven-site-plugin-3.x/}SVN}}
 | {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-surefire-plugin/} surefire}} | B  | 
2.10 | 2011-09-30 | Run the JUnit unit tests in an isolated 
classloader. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/plugins/maven-surefire-plugin/} surefire}} | B  | 
2.11 | 2011-12-04 | Run the JUnit unit tests in an isolated 
classloader. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-verifier-plugin/} verifier}} | B  | 
1.0  | 2010-01-30 | Useful for integration tests - verifies the 
existence of certain conditions. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-verifier-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MVERIFIER}JIRA}}
 
*--++--++--+++
@@ -122,7 +122,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-project-info-reports-plugin/} project-info-reports}} 
| R | 2.4   | 2011-05-19 | Generate standard project reports. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MPIR}JIRA}}

svn commit: r1210210 - in /maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore: MavenSurefireJUnit47RunnerTest.java MavenSurefireJUnit48RunnerTes

2011-12-04 Thread krosenvold

Author: krosenvold
Date: Sun Dec  4 20:48:31 2011
New Revision: 1210210

URL: http://svn.apache.org/viewvc?rev=1210210view=rev
Log:
o Fixed some javadoc problems

Modified:

maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java

maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java

maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java?rev=1210210r1=1210209r2=1210210view=diff
==
--- 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
 Sun Dec  4 20:48:31 2011
@@ -34,6 +34,7 @@ import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
 /**
+ * {@code
  * TestCase that expose No tests were executed! on Test failure using Maven 
Surefire 2.6-SNAPSHOT
  * and the JUnit 4.7 Runner.
  * p/
@@ -82,6 +83,7 @@ import org.junit.runner.notification.Fai
  * version2.6-SNAPSHOT/version
  * scopetest/scope
  * /dependency
+ * }
  *
  * @author a href=mailto:as...@redhat.com;Aslak Knutsen/a
  * @version $Revision: $

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java?rev=1210210r1=1210209r2=1210210view=diff
==
--- 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
 Sun Dec  4 20:48:31 2011
@@ -36,7 +36,8 @@ import org.junit.runner.notification.Fai
 /**
  * TestCase that expose No tests were executed! on Test failure using Maven 
Surefire 2.6-SNAPSHOT
  * and the JUnit 4.8 Runner.
- * p/
+ * {@code
+ *  * p/
  * ---
  * T E S T S
  * ---
@@ -82,6 +83,7 @@ import org.junit.runner.notification.Fai
  * version2.6-SNAPSHOT/version
  * scopetest/scope
  * /dependency
+ * }
  *
  * @author a href=mailto:as...@redhat.com;Aslak Knutsen/a
  * @version $Revision: $

Modified: 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java?rev=1210210r1=1210209r2=1210210view=diff
==
--- 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
 (original)
+++ 
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
 Sun Dec  4 20:48:31 2011
@@ -42,6 +42,7 @@ import org.junit.runners.BlockJUnit4Clas
 import org.junit.runners.model.InitializationError;
 
 /**
+ * {@code
  * dependency
  * groupIdjunit/groupId
  * artifactIdjunit/artifactId
@@ -67,6 +68,7 @@ import org.junit.runners.model.Initializ
  * version2.8.1/version
  * scopetest/scope
  * /dependency
+ * }
  *
  * @author a href=mailto:as...@redhat.com;Aslak Knutsen/a
  * @version $Revision: $

svn commit: r1210240 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java

2011-12-04 Thread bentmann

Author: bentmann
Date: Sun Dec  4 21:52:04 2011
New Revision: 1210240

URL: http://svn.apache.org/viewvc?rev=1210240view=rev
Log:
o Revised fix from r1151426 which broke the appassembler-maven-plugin

Modified:

maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java?rev=1210240r1=1210239r2=1210240view=diff
==
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
 Sun Dec  4 21:52:04 2011
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import 
org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
 import org.apache.maven.repository.Proxy;
 import org.sonatype.aether.RepositorySystem;
@@ -58,6 +59,8 @@ public class LegacyLocalRepositoryManage
 
 private final LocalRepository repo;
 
+private final boolean realLocalRepo;
+
 public static RepositorySystemSession overlay( ArtifactRepository 
repository, RepositorySystemSession session,
RepositorySystem system )
 {
@@ -103,6 +106,20 @@ public class LegacyLocalRepositoryManage
 repo =
 new LocalRepository( new File( delegate.getBasedir() ),
  ( layout != null ) ? 
layout.getClass().getSimpleName() : legacy );
+
+/*
+ * NOTE: invoker:install vs appassembler:assemble: Both mojos use 
the artifact installer to put an artifact
+ * into a repository. In the first case, the result needs to be a 
proper local repository that one can use for
+ * local artifact resolution. In the second case, the result needs to 
precisely obey the path information of the
+ * repository's layout to allow pointing at artifacts within the 
repository. Unfortunately,
+ * DefaultRepositoryLayout does not correctly describe the layout of a 
local repository which unlike a remote
+ * repository never uses timestamps in the filename of a snapshot 
artifact. The discrepancy gets notable when a
+ * remotely resolved snapshot artifact gets passed into pathOf(). So 
producing a proper local artifact path
+ * using DefaultRepositoryLayout requires us to enforce usage of the 
artifact's base version. This
+ * transformation however contradicts the other use case of precisely 
obeying the repository's layout. The below
+ * flag tries to detect which use case applies to make both plugins 
happy.
+ */
+realLocalRepo = ( layout instanceof DefaultRepositoryLayout )  
local.equals( delegate.getId() );
 }
 
 public LocalRepository getRepository()
@@ -112,7 +129,11 @@ public class LegacyLocalRepositoryManage
 
 public String getPathForLocalArtifact( Artifact artifact )
 {
-return delegate.pathOf( RepositoryUtils.toArtifact( 
artifact.setVersion( artifact.getBaseVersion() ) ) );
+if ( realLocalRepo )
+{
+return delegate.pathOf( RepositoryUtils.toArtifact( 
artifact.setVersion( artifact.getBaseVersion() ) ) );
+}
+return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
 }
 
 public String getPathForRemoteArtifact( Artifact artifact, 
RemoteRepository repository, String context )

svn commit: r1210076 - in /maven/maven-3/trunk: ./ apache-maven/ maven-aether-provider/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ ma

svn commit: r1210077 - /maven/maven-3/tags/maven-3.0.4/

svn commit: r1210201 - /maven/site/trunk/src/site/apt/plugins/index.apt

svn commit: r1210210 - in /maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore: MavenSurefireJUnit47RunnerTest.java MavenSurefireJUnit48RunnerTes

svn commit: r1210240 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java

5 matches

Site Navigation

Mail list logo

Footer information