svn commit: r1788941 - /maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Author: bimargulies
Date: Mon Mar 27 14:47:00 2017
New Revision: 1788941
URL: http://svn.apache.org/viewvc?rev=1788941&view=rev
Log:
[MSHADE-253] Replace deprecated assertions in test.
This closes #107.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java?rev=1788941&r1=1788940&r2=1788941&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Mon Mar 27 14:47:00 2017
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.shade.f
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -38,8 +40,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.ArgumentCaptor;
-import junit.framework.Assert;
-
public class MinijarFilterTest
{
@@ -69,7 +69,7 @@ public class MinijarFilterTest
verify( log, times( 1 ) ).info( logCaptor.capture() );
-Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
+assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
}
@@ -94,7 +94,7 @@ public class MinijarFilterTest
// verify no access to project's artifacts
verify( mavenProject, times(0) ).getArtifacts();
-Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
+assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
}
@@ -145,7 +145,7 @@ public class MinijarFilterTest
verify( log, times( 1 ) ).info( logCaptor.capture() );
-Assert.assertEquals( "Minimized 51 -> 1 (1%)", logCaptor.getValue() );
+assertEquals( "Minimized 51 -> 1 (1%)", logCaptor.getValue() );
}
@@ -162,7 +162,7 @@ public class MinijarFilterTest
verify( log, times( 1 ) ).info( logCaptor.capture() );
-Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
+assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
}
}
svn commit: r1788940 - /maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Author: bimargulies
Date: Mon Mar 27 14:46:58 2017
New Revision: 1788940
URL: http://svn.apache.org/viewvc?rev=1788940&view=rev
Log:
[MSHADE-253] Re-enable minimization test and add pom project test
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java?rev=1788940&r1=1788939&r2=1788940&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
Mon Mar 27 14:46:58 2017
@@ -22,9 +22,20 @@ package org.apache.maven.plugins.shade.f
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.junit.Before;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.mockito.ArgumentCaptor;
import junit.framework.Assert;
@@ -32,37 +43,94 @@ import junit.framework.Assert;
public class MinijarFilterTest
{
-//@Test
-//public void theTestWhichIsTooExpensiveAtTheMoment()
-//throws IOException
-//{
-//ArgumentCaptor logCaptor = ArgumentCaptor.forClass(
CharSequence.class );
-//
-//MavenProject mavenProject = mock( MavenProject.class );
-//Log log = mock( Log.class );
-//
-//Artifact artifact = mock( Artifact.class );
-//when( artifact.getGroupId() ).thenReturn( "com" );
-//when( artifact.getArtifactId() ).thenReturn( "aid" );
-//when( artifact.getVersion() ).thenReturn( "1.9" );
-//when( artifact.getClassifier() ).thenReturn( "classifier1" );
-//when( artifact.getScope() ).thenReturn( Artifact.SCOPE_COMPILE );
-//
-//when( mavenProject.getArtifact() ).thenReturn( artifact );
-//
-//Set artifacts = new TreeSet();
-//artifacts.add( new DefaultArtifact( "dep.com", "dep.aid", "1.0",
"compile", "jar", "classifier2", null ) );
-//
-//when( mavenProject.getArtifacts() ).thenReturn( artifacts );
-//when( mavenProject.getArtifact().getFile() ).thenReturn( mock(
File.class ) );
-//
-//MinijarFilter mf = new MinijarFilter( mavenProject, log );
-//
-//mf.finished();
-//verify( log, times( 1 ) ).info( logCaptor.capture() );
-//
-//Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
-//}
+private File emptyFile;
+
+@Before
+public void init() throws IOException {
+TemporaryFolder tempFolder = new TemporaryFolder();
+tempFolder.create();
+this.emptyFile = tempFolder.newFile();
+
+}
+
+@Test
+public void testWithMockProject()
+throws IOException
+{
+ArgumentCaptor logCaptor = ArgumentCaptor.forClass(
CharSequence.class );
+
+MavenProject mavenProject = mockProject(emptyFile);
+
+Log log = mock( Log.class );
+
+MinijarFilter mf = new MinijarFilter( mavenProject, log );
+
+mf.finished();
+
+verify( log, times( 1 ) ).info( logCaptor.capture() );
+
+Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
+
+}
+
+@Test
+public void testWithPomProject()
+throws IOException
+{
+ArgumentCaptor logCaptor = ArgumentCaptor.forClass(
CharSequence.class );
+
+// project with pom packaging and no artifact.
+MavenProject mavenProject = mockProject(null);
+mavenProject.setPackaging("pom");
+
+Log log = mock( Log.class );
+
+MinijarFilter mf = new MinijarFilter( mavenProject, log );
+
+mf.finished();
+
+verify( log, times( 1 ) ).info( logCaptor.capture() );
+
+// verify no access to project's artifacts
+verify( mavenProject, times(0) ).getArtifacts();
+
+Assert.assertEquals( "Minimized 0 -> 0", logCaptor.getValue() );
+
+}
+
+private MavenProject mockProject(File file) {
+MavenProject mavenProject = mock( MavenProject.class );
+
+Artifact artifact = mock( Artifact.class );
+when( artifact.ge
svn commit: r1788939 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Author: bimargulies
Date: Mon Mar 27 14:46:56 2017
New Revision: 1788939
URL: http://svn.apache.org/viewvc?rev=1788939&view=rev
Log:
[MSHADE-253] NullPointerException if minimizeJar == true && packaging == pom
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1788939&r1=1788938&r2=1788939&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Mon Mar 27 14:46:56 2017
@@ -86,25 +86,28 @@ public class MinijarFilter
public MinijarFilter( MavenProject project, Log log, List
simpleFilters )
throws IOException
{
+ this.log = log;
-this.log = log;
+ File artifactFile = project.getArtifact().getFile();
-Clazzpath cp = new Clazzpath();
+if ( artifactFile != null )
+{
+ Clazzpath cp = new Clazzpath();
-ClazzpathUnit artifactUnit =
-cp.addClazzpathUnit( new FileInputStream(
project.getArtifact().getFile() ), project.toString() );
+ ClazzpathUnit artifactUnit = cp.addClazzpathUnit( new
FileInputStream( artifactFile ), project.toString() );
-for ( Artifact dependency : project.getArtifacts() )
-{
-addDependencyToClasspath( cp, dependency );
-}
+for ( Artifact dependency : project.getArtifacts() )
+{
+addDependencyToClasspath( cp, dependency );
+}
-removable = cp.getClazzes();
-removePackages( artifactUnit );
-removable.removeAll( artifactUnit.getClazzes() );
-removable.removeAll( artifactUnit.getTransitiveDependencies() );
-removeSpecificallyIncludedClasses( project, simpleFilters == null ?
Collections.emptyList()
-: simpleFilters );
+removable = cp.getClazzes();
+removePackages( artifactUnit );
+removable.removeAll( artifactUnit.getClazzes() );
+removable.removeAll( artifactUnit.getTransitiveDependencies() );
+removeSpecificallyIncludedClasses( project,
+simpleFilters == null ? Collections.emptyList()
: simpleFilters );
+}
}
private ClazzpathUnit addDependencyToClasspath( Clazzpath cp, Artifact
dependency )
@@ -214,7 +217,7 @@ public class MinijarFilter
String className = classFile.replace( '/', '.' ).replaceFirst(
"\\.class$", "" );
Clazz clazz = new Clazz( className );
-if ( removable.contains( clazz ) )
+if ( removable != null && removable.contains( clazz ) )
{
log.debug( "Removing " + className );
classesRemoved += 1;
svn commit: r10856 - /release/maven/surefire/
Author: bimargulies Date: Sun Oct 18 21:44:57 2015 New Revision: 10856 Log: Maven surefire 2.19. Added: release/maven/surefire/surefire-2.19-source-release.zip (with props) release/maven/surefire/surefire-2.19-source-release.zip.asc release/maven/surefire/surefire-2.19-source-release.zip.md5 (with props) Removed: release/maven/surefire/surefire-2.18.1-source-release.zip release/maven/surefire/surefire-2.18.1-source-release.zip.asc release/maven/surefire/surefire-2.18.1-source-release.zip.md5 Added: release/maven/surefire/surefire-2.19-source-release.zip == Binary file - no diff available. Propchange: release/maven/surefire/surefire-2.19-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/surefire/surefire-2.19-source-release.zip.asc == --- release/maven/surefire/surefire-2.19-source-release.zip.asc (added) +++ release/maven/surefire/surefire-2.19-source-release.zip.asc Sun Oct 18 21:44:57 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABAgAGBQJWHqnkAAoJEAVR/TaE/Lu3JjIP/2WWOvI29bLqHM3jx4fvBD/i +QvV/JUztl51heYWuqktMjMqI95p5VMwUnm56XE4cwuDsNdNjeHb3d37HfshukH29 +esO8mE+BqSAZ7jsdhVtLSvFGGNmuuaOzTEz6DRSLfGmCMXHgODkNlp5MXofrIhHA +FPO5A9CMB2IHxmFjepjZuznbIPMJAdVmwvQLRj8NZaYXfYvMHf2ZVkO4lazSr98y +wAgwCm4LMb3zKLw/0w1H6I8CgjXF1g9xrH3v77/P4zlQK/DYNKbi82KAngI1jIlR +kp2N17j5L3xGF6GwEWUUvndOKIZ5JeAX0Ko0JIDz8cf22GL/UFqlTwZceI72FG0c +DdF/gT6JtkpiK0UnfrTT44GuAuH2Ja+0XHj2RzJ0vjYbimXHcEsZJ1goxNj7/ZW4 +t95FpVnySSqQazCsWn5IOMeDAE4ooD0o+RGiaJEJXBr7lY3KYhqWvTpZpSZbQetY +l/sQTd4Im3g6vibPDZmWsHVkDsYpamSBiUAw82rU5z1o8zUShpZ5TlpuNGgkgeaq +TplzU8tR+dCLEizuxf44o0dpSV36WwvmQBB4J/dbYPY62Nje5D0H6BuoshG8S2Yg +U49FLpiHZVTRzvZ8VyX/LcbqDofkd+ymCKuodHa4+BD6qHUZ6aWsVt+hFoXgdJrb +RlvwqesO0JSf4XXcT6EK +=pQll +-END PGP SIGNATURE- Added: release/maven/surefire/surefire-2.19-source-release.zip.md5 == --- release/maven/surefire/surefire-2.19-source-release.zip.md5 (added) +++ release/maven/surefire/surefire-2.19-source-release.zip.md5 Sun Oct 18 21:44:57 2015 @@ -0,0 +1 @@ +7587628e1c27c93e9865533bd24591fc \ No newline at end of file Propchange: release/maven/surefire/surefire-2.19-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/surefire/surefire-2.19-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r10854 - /release/maven/plugins/
Author: bimargulies Date: Sun Oct 18 20:04:07 2015 New Revision: 10854 Log: Release checkstyle 2.17. Added: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip (with props) release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.asc release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 (with props) Removed: release/maven/plugins/maven-checkstyle-plugin-2.16-source-release.zip release/maven/plugins/maven-checkstyle-plugin-2.16-source-release.zip.asc release/maven/plugins/maven-checkstyle-plugin-2.16-source-release.zip.md5 Added: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.asc == --- release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.asc (added) +++ release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.asc Sun Oct 18 20:04:07 2015 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJWH+tFAAoJEBoqHJS96JaI5bsH+gLE0oZG0RAWcxbJTpDYi88y +TjGLQ220KkBOf8TDANA5QFXZ78IfOJQ6G66gHesEOAFrSh5ixJHxfIHoUV+9mZpT +Kv/UhzRcWybDn/whbzWCndlMvtUWuIo0YeAetlGBnDq2vTCKDW32ZIqpNSWaYL9A +1rVMmHjLeyr2pPPswMvEH8+YlXBJ1n0swq82nGab7J7vp3CuEBEG+UE3KSOOgt2t +TtZID47gDty/1o6m6NZfrie+N0tyjesHMFPcixfS2v6ho0P9k9TcI8fAG53F5wu5 +i0GY6NhV9rVDe7fj8sPTw83Lttu/r48FircDGPg7Dx+BLInNE+W8ippr8RhJxMs= +=XhoR +-END PGP SIGNATURE- Added: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 == --- release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 (added) +++ release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 Sun Oct 18 20:04:07 2015 @@ -0,0 +1 @@ +5fbc819fcb2798887d9edb9e5bbbdd1c \ No newline at end of file Propchange: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r10846 - /release/maven/release/
Author: bimargulies Date: Sat Oct 17 23:58:52 2015 New Revision: 10846 Log: Release maven-release 2.5.3 Added: release/maven/release/maven-release-2.5.3-source-release.zip (with props) release/maven/release/maven-release-2.5.3-source-release.zip.asc release/maven/release/maven-release-2.5.3-source-release.zip.md5 (with props) Removed: release/maven/release/maven-release-2.5.2-source-release.zip release/maven/release/maven-release-2.5.2-source-release.zip.asc release/maven/release/maven-release-2.5.2-source-release.zip.md5 Added: release/maven/release/maven-release-2.5.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/release/maven-release-2.5.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/release/maven-release-2.5.3-source-release.zip.asc == --- release/maven/release/maven-release-2.5.3-source-release.zip.asc (added) +++ release/maven/release/maven-release-2.5.3-source-release.zip.asc Sat Oct 17 23:58:52 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJWHkJ8AAoJEJxPfp2YscxTTL4QAMeTJXoPZ0bXYkmp+A7PnzZD +ZKz6E/9U/atWUtNTmVm/k/7dBH9Td0o0o9cjPvAg4Bac1moqOBDycmUA8q+2w8fx +ofBi+avKzHvcesIq+L0dE5W0MHEe1xe6wnaxBlm987J9/iOLKtZM5La4rQT/IEij +BSt4tRPKZ5szVVlB9+j8qugXaezOFgFadwrkTzHddr8sLtaJik6D8hKTLYQURGLk +fVv5sdxDRE3qe/FkN/WqD90nN4STYkGAUymQJz6IV8SixXEXl4CYS6AT6pcY15ZS +QumIon5XaRDf3PpId+yBwrO9H3dKfrZrFXmBmNW67VOMt4YFBs734IWcguLvOVAs +7rmHOb5DV39ZO/EYZQjXWLUv1CnbSY1axkg9AJ+Bbfvei2CKItUa8enjRbKKpuvu +C7VA02rvyAzq7V2P8h8Y0mS+tm0EnrfKNRd8vUFt7xkYJutMdzyvKGEeggBs53IP +IHQzJL4VXrP/fNbrlhMXetl5VSkxf8qRRSFQ6olTn2/hEMPzAvjxxJBN9vyxE7iL +qW5WuA4NaTAQPEowBwv/vNdPLuho45zh3bzYHO4VjprUPuy3n6stQuQSxetGZ3J/ +Z5h6pUN6xVSmstGivzgRtX4RObK0X0jhTcKKEzb5Ey51yUy2mqx6ywi9y6CUEUgd +Vr/eOVRjcxzPwjM3hAdG +=rtid +-END PGP SIGNATURE- Added: release/maven/release/maven-release-2.5.3-source-release.zip.md5 == --- release/maven/release/maven-release-2.5.3-source-release.zip.md5 (added) +++ release/maven/release/maven-release-2.5.3-source-release.zip.md5 Sat Oct 17 23:58:52 2015 @@ -0,0 +1 @@ +4a9bc8e9b73088d1fb62ea6835540e61 Propchange: release/maven/release/maven-release-2.5.3-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/release/maven-release-2.5.3-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r1708590 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Wed Oct 14 11:53:56 2015 New Revision: 1708590 URL: http://svn.apache.org/viewvc?rev=1708590&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1708590&r1=1708589&r2=1708590&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Wed Oct 14 11:53:56 2015 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.3 +2.5.4-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708590&r1=1708589&r2=1708590&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:53:56 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3 +2.5.4-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.3 + 2.5.4-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1708590&r1=1708589&r2=1708590&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Wed Oct 14 11:53:56 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3 +2.5.4-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.3 + 2.5.4-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1708590&r1=1708589&r2=1708590&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Wed Oct 14 11:53:56 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3 +2.5.4-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708590&r1=1708589&r2=1708590&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Wed Oct 14 11:53:56 2015 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.3 + 2.5.4-SNAPSHOT pom Maven Release @@ -47,9 +47,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.3 - scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.3 - http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.3 + scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk +http://svn.apache.org/viewvc/maven/release/trunk jira
svn commit: r1708588 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Wed Oct 14 11:53:42 2015 New Revision: 1708588 URL: http://svn.apache.org/viewvc?rev=1708588&view=rev Log: [maven-release-plugin] prepare release maven-release-2.5.3 Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1708588&r1=1708587&r2=1708588&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Wed Oct 14 11:53:42 2015 @@ -1,55 +1,55 @@ - - - -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - -org.apache.maven.release -maven-release -2.5.3-SNAPSHOT - - - maven-release-api - - Maven Release APIs - - - - org.apache.maven - maven-repository-metadata - - - org.apache.maven - maven-artifact - - - org.eclipse.aether - aether-util - 1.0.0.v20140518 - - - - junit - junit - 4.8.1 - test - - + + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + +org.apache.maven.release +maven-release +2.5.3 + + + maven-release-api + + Maven Release APIs + + + + org.apache.maven + maven-repository-metadata + + + org.apache.maven + maven-artifact + + + org.eclipse.aether + aether-util + 1.0.0.v20140518 + + + + junit + junit + 4.8.1 + test + + \ No newline at end of file Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708588&r1=1708587&r2=1708588&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:53:42 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.3 maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.3-SNAPSHOT + 2.5.3 org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1708588&r1=1708587&r2=1708588&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Wed Oct 14 11:53:42 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.3 org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.3-SNAPSHOT + 2.5.3 org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1708588&r1=1708587&r2=1708588&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Wed Oct 14 11:53:42 2015 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.3 ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708588&r1=1708587&r2=1708588&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Wed Oct 14 11:53:42 2015 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.3-SNAPSHOT + 2.5.3 pom Maven Release @@ -47,9 +47,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk -http://svn.apache.org/viewvc/maven/release/trunk +
svn commit: r1708589 - /maven/release/tags/maven-release-2.5.3/
Author: bimargulies Date: Wed Oct 14 11:53:54 2015 New Revision: 1708589 URL: http://svn.apache.org/viewvc?rev=1708589&view=rev Log: [maven-release-plugin] copy for tag maven-release-2.5.3 Added: maven/release/tags/maven-release-2.5.3/ - copied from r1708588, maven/release/trunk/
svn commit: r1708587 - in /maven/release/trunk: ./ maven-release-manager/ maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ maven-release-manager/src/main/java/org/apache/mav
Author: bimargulies
Date: Wed Oct 14 11:52:53 2015
New Revision: 1708587
URL: http://svn.apache.org/viewvc?rev=1708587&view=rev
Log:
SCM-775: revert the change, so that I can release this plugin.
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1708587&r1=1708586&r2=1708587&view=diff
==
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Wed Oct 14 11:52:53 2015
@@ -235,7 +235,7 @@
- 2.5.3
+ 2.5.1
false
true
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
Wed Oct 14 11:52:53 2015
@@ -238,11 +238,6 @@ public class PropertiesReleaseDescriptor
properties.setProperty( "pushChanges", Boolean.toString(
config.isPushChanges() ) );
-if ( config.getWorkItem() != null )
-{
-properties.setProperty( "workItem", config.getWorkItem() );
-}
-
// others boolean properties are not written to the properties file
because the value from the caller is always
// used
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
Wed Oct 14 11:52:53 2015
@@ -101,7 +101,6 @@ public class ReleaseUtils
mergeInto.setRemoteTagging( toBeMerged.isRemoteTagging() );
mergeInto.setLocalCheckout( toBeMerged.isLocalCheckout() );
mergeInto.setPushChanges( toBeMerged.isPushChanges() );
-mergeInto.setWorkItem( toBeMerged.getWorkItem() );
mergeInto.setWaitBeforeTagging( toBeMerged.getWaitBeforeTagging() );
// If the user specifies versions, these should be override the
existing versions
@@ -174,7 +173,6 @@ public class ReleaseUtils
remoteTaggingStr == null ? false : Boolean.valueOf(
remoteTaggingStr ).booleanValue() );
String pushChanges = properties.getProperty( "pushChanges" );
releaseDescriptor.setPushChanges( pushChanges == null ? true :
Boolean.valueOf( pushChanges ).booleanValue() );
-String workItem = properties.getProperty( "workItem" );
loadResolvedDependencies( properties, releaseDescriptor );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1708587&r1=1708586&r2=1708587&view=diff
==
---
m
svn commit: r1708410 - /maven/site/trunk/content/apt/pom.apt
Author: bimargulies
Date: Tue Oct 13 14:35:12 2015
New Revision: 1708410
URL: http://svn.apache.org/viewvc?rev=1708410&view=rev
Log:
More detail on dependency management.
Modified:
maven/site/trunk/content/apt/pom.apt
Modified: maven/site/trunk/content/apt/pom.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/pom.apt?rev=1708410&r1=1708409&r2=1708410&view=diff
==
--- maven/site/trunk/content/apt/pom.apt (original)
+++ maven/site/trunk/content/apt/pom.apt Tue Oct 13 14:35:12 2015
@@ -1,10 +1,10 @@
POM Reference
-
- Eric Redmond
+ Eric Redmond, et al.
Karl Heinz Marbaise
-
- 2008-01-02
+ 2015-10-13
-
POM Reference
@@ -577,9 +577,17 @@ mvn install:install-file -Dfile=non-mave
<<>>, then POMs inheriting from this one can set their
dependency giving
the <<>>=<<>> and <<>>=<<>> only, then
Maven will fill in
the <<>> set by the parent. The benefits of this method are
obvious. Dependency
- details can be set in one central location, which will propagate to all
inheriting POMs. In
- addition, the version and scope of artifacts which are incorporated from
transitive dependencies
- may also be controlled by specifying them in a dependency management section.
+ details can be set in one central location, which will propagate to all
inheriting POMs.
+
+ Note that the version and scope of artifacts which are incorporated from
transitive dependencies
+ are also controlled by version specifications in a dependency management
section. This can lead
+ to unexpected consequences. Consider a case in which your project uses two
dependences,
+ <<>> and <<>>. <<>> in turn also uses <<>>, and
requires
+ a particular minimum version to function. If you then use
<<>>
+ to specify an older version, <<>> will be forced to use the older
version, and fail.
+ So, you must be careful to check the entire dependency tree to avoid this
problem;
+ <<>> is helpful.
+
** {Aggregation} (or Multi-Module)
svn commit: r10803 - /release/maven/plugins/
Author: bimargulies Date: Tue Oct 13 11:59:54 2015 New Revision: 10803 Log: Release maven-plugins parent pom version 28. Added: release/maven/plugins/maven-plugins-28-source-release.zip (with props) release/maven/plugins/maven-plugins-28-source-release.zip.asc release/maven/plugins/maven-plugins-28-source-release.zip.md5 (with props) Removed: release/maven/plugins/maven-plugins-27-source-release.zip release/maven/plugins/maven-plugins-27-source-release.zip.asc release/maven/plugins/maven-plugins-27-source-release.zip.md5 Added: release/maven/plugins/maven-plugins-28-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-plugins-28-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-plugins-28-source-release.zip.asc == --- release/maven/plugins/maven-plugins-28-source-release.zip.asc (added) +++ release/maven/plugins/maven-plugins-28-source-release.zip.asc Tue Oct 13 11:59:54 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJWGbDnAAoJEJxPfp2YscxTou4QAId3WBMgnRtZ0hniQSVAIJ1P +eOROHm2FhapN9j/8dqbnsPgU+pLgkZ8MLgQvPOlF6mkIPZmca/WRUKZTfK2C5zKQ +C+WKPOV1Urbq+VdIqHfTgm1vSbXWw4XHNntxuOgKfyOB2PCh1KNiCS4GDkzmk12O +nlkgNeR7ex+fYP5hkiLj0kiE8L6apispFWfBloAaPTuMrauAOVC5SXH40Fa4sA5V +hFqdUPdnAHPyfb0Dnt+FJp/wTTHLRL0Ybsj7Bf+RnF/Wc4S2LjxJeZLqVu9Qq/eE +w+IJv2D0b/HcX+u5/41Z9q6PxGze+41uPJor0yyU+cK+tRgV1fBFB7Irmn3OwHsA +UjsJjHVIbZJRzim4u8Yk0TiYc6bntNq+r7IEUR7dxyUbTE2qzZ025XVcHhiSSb5V +ne2UCx+MBLSKcBZh5ko7hgpcfGxJGACkAW4PxD0FgZ+ilDZOavf6M5k4IIKEwGar +P95BCJMxlZ/AUJMQ6ITs+YoR9Aky9RQPSGZUn0Ikh/aWJ049tv64jWVdHpZiUnAi +I8vpty1QvFsk0FQgxjrrAOVMVNNys3HD7CbduB/ZJFrpZNvFMpOP11uqkC3wapL9 +Azx0r6t0JyGxXF0dp3ZzB0uA4rXlw5ueThlxgkR/jDwIA7HwZPEz0zUVDBZHSHao +H/KUxtPBMGhyLXBPZS99 +=/WwY +-END PGP SIGNATURE- Added: release/maven/plugins/maven-plugins-28-source-release.zip.md5 == --- release/maven/plugins/maven-plugins-28-source-release.zip.md5 (added) +++ release/maven/plugins/maven-plugins-28-source-release.zip.md5 Tue Oct 13 11:59:54 2015 @@ -0,0 +1 @@ +884337b51db10c92e263ef8f92bd497b Propchange: release/maven/plugins/maven-plugins-28-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/plugins/maven-plugins-28-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r1708354 - /maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml
Author: bimargulies Date: Tue Oct 13 11:42:59 2015 New Revision: 1708354 URL: http://svn.apache.org/viewvc?rev=1708354&view=rev Log: no jira: work around: [INFO] --- maven-checkstyle-plugin:2.15:check (checkstyle-check) @ maven-release-oddeven-policy --- [INFO] There is 1 error reported by Checkstyle 6.1.1 with config/maven_checks.xml ruleset. [ERROR] src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java[1] (header) RegexpHeader: Line does not match expected header line of '^package '. Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1708354&r1=1708353&r2=1708354&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Tue Oct 13 11:42:59 2015 @@ -31,6 +31,10 @@ maven-release-oddeven-policy Maven Release Odd-Even Policy + +true + @@ -76,4 +80,4 @@ - \ No newline at end of file +
svn commit: r1708012 - /maven/release/trunk/pom.xml
Author: bimargulies Date: Sun Oct 11 19:08:43 2015 New Revision: 1708012 URL: http://svn.apache.org/viewvc?rev=1708012&view=rev Log: MRELEASE-925: Old version of plexus utils forced here causes failures Modified: maven/release/trunk/pom.xml Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1708012&r1=1708011&r2=1708012&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Sun Oct 11 19:08:43 2015 @@ -128,7 +128,7 @@ org.codehaus.plexus plexus-utils -3.0.10 +3.0.15 org.jdom
svn commit: r1707964 - /maven/shared/trunk/maven-common-artifact-filters/pom.xml
Author: bimargulies Date: Sun Oct 11 11:00:27 2015 New Revision: 1707964 URL: http://svn.apache.org/viewvc?rev=1707964&view=rev Log: rollback mistaken release. Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=1707964&r1=1707963&r2=1707964&view=diff == --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Sun Oct 11 11:00:27 2015 @@ -28,7 +28,7 @@ maven-common-artifact-filters - 3.0.1-SNAPSHOT + 3.0-SNAPSHOT Apache Maven Common Artifact Filters A collection of ready-made filters to control inclusion/exclusion of artifacts during dependency resolution.
svn commit: r1707963 - /maven/shared/tags/maven-common-artifact-filters-3.0/
Author: bimargulies Date: Sun Oct 11 10:59:50 2015 New Revision: 1707963 URL: http://svn.apache.org/viewvc?rev=1707963&view=rev Log: rollback. Removed: maven/shared/tags/maven-common-artifact-filters-3.0/
svn commit: r1707943 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: bimargulies Date: Sun Oct 11 00:43:27 2015 New Revision: 1707943 URL: http://svn.apache.org/viewvc?rev=1707943&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-plugins/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1707943&r1=1707942&r2=1707943&view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Sun Oct 11 00:43:27 2015 @@ -29,7 +29,7 @@ under the License. org.apache.maven.plugins maven-plugins - 28 + 29-SNAPSHOT pom Apache Maven Plugins @@ -37,9 +37,9 @@ under the License. http://maven.apache.org/plugins/ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-28 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-28 -http://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-28 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/ +http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/ Jenkins
svn commit: r1707942 - /maven/plugins/tags/maven-plugins-28/
Author: bimargulies Date: Sun Oct 11 00:43:26 2015 New Revision: 1707942 URL: http://svn.apache.org/viewvc?rev=1707942&view=rev Log: [maven-release-plugin] copy for tag maven-plugins-28 Added: maven/plugins/tags/maven-plugins-28/ - copied from r1707941, maven/plugins/trunk/maven-plugins/
svn commit: r1707941 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: bimargulies Date: Sun Oct 11 00:43:13 2015 New Revision: 1707941 URL: http://svn.apache.org/viewvc?rev=1707941&view=rev Log: [maven-release-plugin] prepare release maven-plugins-28 Modified: maven/plugins/trunk/maven-plugins/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1707941&r1=1707940&r2=1707941&view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Sun Oct 11 00:43:13 2015 @@ -29,7 +29,7 @@ under the License. org.apache.maven.plugins maven-plugins - 28-SNAPSHOT + 28 pom Apache Maven Plugins @@ -37,9 +37,9 @@ under the License. http://maven.apache.org/plugins/ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/ -http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-28 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-28 +http://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-28 Jenkins
svn commit: r1707936 - /maven/plugins/trunk/maven-plugins/site-pom.xml
Author: bimargulies Date: Sun Oct 11 00:14:56 2015 New Revision: 1707936 URL: http://svn.apache.org/viewvc?rev=1707936&view=rev Log: (no jira) set version in site-pom.xml for release. Modified: maven/plugins/trunk/maven-plugins/site-pom.xml Modified: maven/plugins/trunk/maven-plugins/site-pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/site-pom.xml?rev=1707936&r1=1707935&r2=1707936&view=diff == --- maven/plugins/trunk/maven-plugins/site-pom.xml (original) +++ maven/plugins/trunk/maven-plugins/site-pom.xml Sun Oct 11 00:14:56 2015 @@ -25,7 +25,7 @@ under the License. org.apache.maven.plugins maven-plugins -27 +28 ./pom.xml
svn commit: r1707935 - /maven/shared/trunk/maven-common-artifact-filters/pom.xml
Author: bimargulies Date: Sun Oct 11 00:03:25 2015 New Revision: 1707935 URL: http://svn.apache.org/viewvc?rev=1707935&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=1707935&r1=1707934&r2=1707935&view=diff == --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Sun Oct 11 00:03:25 2015 @@ -28,15 +28,15 @@ maven-common-artifact-filters - 3.0 + 3.0.1-SNAPSHOT Apache Maven Common Artifact Filters A collection of ready-made filters to control inclusion/exclusion of artifacts during dependency resolution. - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-common-artifact-filters-3.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-common-artifact-filters-3.0 - http://svn.apache.org/viewvc/maven/shared/tags/maven-common-artifact-filters-3.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters + http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters jira
svn commit: r1707934 - /maven/shared/tags/maven-common-artifact-filters-3.0/
Author: bimargulies Date: Sun Oct 11 00:03:24 2015 New Revision: 1707934 URL: http://svn.apache.org/viewvc?rev=1707934&view=rev Log: [maven-release-plugin] copy for tag maven-common-artifact-filters-3.0 Added: maven/shared/tags/maven-common-artifact-filters-3.0/ - copied from r1707933, maven/shared/trunk/maven-common-artifact-filters/
svn commit: r1707933 - /maven/shared/trunk/maven-common-artifact-filters/pom.xml
Author: bimargulies Date: Sun Oct 11 00:03:10 2015 New Revision: 1707933 URL: http://svn.apache.org/viewvc?rev=1707933&view=rev Log: [maven-release-plugin] prepare release maven-common-artifact-filters-3.0 Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=1707933&r1=1707932&r2=1707933&view=diff == --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Sun Oct 11 00:03:10 2015 @@ -28,15 +28,15 @@ maven-common-artifact-filters - 3.0-SNAPSHOT + 3.0 Apache Maven Common Artifact Filters A collection of ready-made filters to control inclusion/exclusion of artifacts during dependency resolution. - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters - http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-common-artifact-filters-3.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-common-artifact-filters-3.0 + http://svn.apache.org/viewvc/maven/shared/tags/maven-common-artifact-filters-3.0 jira
svn commit: r1707871 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
Author: bimargulies
Date: Sat Oct 10 11:58:14 2015
New Revision: 1707871
URL: http://svn.apache.org/viewvc?rev=1707871&view=rev
Log:
MDEP-509: also show optional for dependency:list
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java?rev=1707871&r1=1707870&r2=1707871&view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
Sat Oct 10 11:58:14 2015
@@ -209,8 +209,14 @@ public class DependencyStatusSets
}
String id = outputScope ? artifact.toString() : artifact.getId();
+String optionalMarker = "";
+if ( outputScope && artifact.isOptional() )
+{
+optionalMarker = " (optional) ";
+}
artifactStringList.add( " " + id + (
outputAbsoluteArtifactFilename ? ":" + artifactFilename : "" )
++ optionalMarker
+ "\n" );
}
if ( sort )
svn commit: r1707870 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: bimargulies Date: Sat Oct 10 11:50:50 2015 New Revision: 1707870 URL: http://svn.apache.org/viewvc?rev=1707870&view=rev Log: no jira: use release version of maven-dependency-tree. Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1707870&r1=1707869&r2=1707870&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Oct 10 11:50:50 2015 @@ -211,7 +211,7 @@ under the License. org.apache.maven.shared maven-dependency-tree - 3.0-SNAPSHOT + 3.0 org.apache.maven.shared
svn commit: r1707867 - /maven/site/trunk/content/apt/shared/index.apt
Author: bimargulies
Date: Sat Oct 10 11:37:25 2015
New Revision: 1707867
URL: http://svn.apache.org/viewvc?rev=1707867&view=rev
Log:
maven dependency tree 3.0.
Modified:
maven/site/trunk/content/apt/shared/index.apt
Modified: maven/site/trunk/content/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1707867&r1=1707866&r2=1707867&view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Sat Oct 10 11:37:25 2015
@@ -44,7 +44,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-dependency-analyzer/} <<>>}} |
1.6 | 2015-01-18| Maven Dependency Analyzer component. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/}SVN}}
| {{{https://issues.apache.org/jira/browse/MSHARED/component/13265}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-dependency-tree/} <<>>}} |
2.2 | 2014-09-14| Maven Dependency Tree constructs a tree
model of a Maven project's dependencies. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}}
| {{{https://issues.apache.org/jira/browse/MSHARED/component/13264}JIRA}}
+| {{{/shared/maven-dependency-tree/} <<>>}} |
3.0 | 2015-10-10| Maven Dependency Tree constructs a tree
model of a Maven project's dependencies. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}}
| {{{https://issues.apache.org/jira/browse/MSHARED/component/13264}JIRA}}
*+--+---+--++-+
| {{{/doxia/doxia-tools/doxia-integration-tools/} <<>>}} |
| | moved to
{{{/doxia/doxia-tools/doxia-integration-tools/} <<>>}}
| |
*+--+---+--++-+
svn commit: r10766 - /release/maven/shared/
Author: bimargulies Date: Sat Oct 10 11:33:00 2015 New Revision: 10766 Log: release maven dependency tree 3.0. Added: release/maven/shared/maven-dependency-tree-3.0-source-release.zip (with props) release/maven/shared/maven-dependency-tree-3.0-source-release.zip.asc release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 (with props) Removed: release/maven/shared/maven-dependency-tree-2.2-source-release.zip release/maven/shared/maven-dependency-tree-2.2-source-release.zip.asc release/maven/shared/maven-dependency-tree-2.2-source-release.zip.md5 Added: release/maven/shared/maven-dependency-tree-3.0-source-release.zip == Binary file - no diff available. Propchange: release/maven/shared/maven-dependency-tree-3.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/shared/maven-dependency-tree-3.0-source-release.zip.asc == --- release/maven/shared/maven-dependency-tree-3.0-source-release.zip.asc (added) +++ release/maven/shared/maven-dependency-tree-3.0-source-release.zip.asc Sat Oct 10 11:33:00 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJWFZYAAAoJEJxPfp2YscxT5SoP/jD9UkYwn1P5OlNlSB/Kg0u6 +DQwa8a3hEvBA4Dr9J3Uokn0gQAEdsNm4daoZPOI6WaP+X87pc5f2dieM4va9Kcyf +PYaZDgwg28QO4IT5rQfhk82zgjmZ0ifOSblO9F8+K24Axs2Udo/zJOam7kvbL2r9 +dUA6qKPvCfkH+KI9x3EHCO0T2Euij/2GhcdUsYVppJkmap9ZGRjPmMnoL6ZswOnT +vmqnE4hVP/PBqwDIcFAXYcFm8NR8qV5VwMV4+IHEUKqj1sutinciG1DG6hemqcdZ +c9pKlaRGCW/iZkTfvMXHG69xjrZUXCt1bqMOV7zhkjQz1wf5ldWk7cmP7dobQBhA +pvuXuxfbPFC342PPwCegKyD4JxF0yiDToT0aNZgA8kQx4guQbo+SzWjrEwAJ4uwN +kUJMS+Ksop0P0eaJkCfPkYWc8yZtMF2ftHPezc+az+H82/ewSKrzk62gBMbk78bX +dLD1QeEWQFPHzC3zjdGCKOmDly4YabZTVWy4it+591tk1s9sLKCiafTo6rkxHqHB +A5erlZ5OVfOI7w4gNp/pVa0pkImKPah2Vb3VIg4cb0bcRax/Agua7QeV70D0ESsj +yOVwg0AshVMJY2hJXPjw/BKEHr1r6gORlcj0iIfd3zJqHvYkGDkclbkm6CqndKka +ZzYArg94Nu0EfHrSmQ1s +=SgnA +-END PGP SIGNATURE- Added: release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 == --- release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 (added) +++ release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 Sat Oct 10 11:33:00 2015 @@ -0,0 +1 @@ +ed0bba77bb2265c46d02c0047c1436ce Propchange: release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/shared/maven-dependency-tree-3.0-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r1707861 - /maven/site/trunk/content/apt/plugins/index.apt
Author: bimargulies
Date: Sat Oct 10 11:24:17 2015
New Revision: 1707861
URL: http://svn.apache.org/viewvc?rev=1707861&view=rev
Log:
Release assembly 2.6.
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1707861&r1=1707860&r2=1707861&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Sat Oct 10 11:24:17 2015
@@ -135,7 +135,7 @@ Available Plugins
*--++--++--+++
| {{{/archetype/maven-archetype-plugin/} <<>>}} | B |
2.4 | 2015-08-09 | Generate a skeleton project structure from an
archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/ARCHETYPE}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-assembly-plugin/} <<>>}} | B |
2.5.5| 2015-06-04 | Build an assembly (distribution) of sources and/or
binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
+| {{{/plugins/maven-assembly-plugin/} <<>>}} | B |
2.6 | 2015-10-10 | Build an assembly (distribution) of sources and/or
binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
*--++--++--+++
| {{{/plugins/maven-dependency-plugin/} <<>>}} | B+R|
2.10 | 2015-01-27 | Dependency manipulation (copy, unpack) and
analysis. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
| {{{https://issues.apache.org/jira/browse/MDEP}JIRA}}
*--++--++--+++
svn commit: r10765 - /release/maven/plugins/
Author: bimargulies Date: Sat Oct 10 11:20:35 2015 New Revision: 10765 Log: Release maven-assembly-plugin 2.6. Added: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip (with props) release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.asc release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 (with props) Removed: release/maven/plugins/maven-assembly-plugin-2.5.5-source-release.zip release/maven/plugins/maven-assembly-plugin-2.5.5-source-release.zip.asc release/maven/plugins/maven-assembly-plugin-2.5.5-source-release.zip.md5 Added: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.asc == --- release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.asc (added) +++ release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.asc Sat Oct 10 11:20:35 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJWE8QoAAoJEJxPfp2YscxT+DoP/3Dg6tERjOkvKq0ff+gdmr5X +7+QTl2JcUC5U3yX63LEdZwD/rlGTy86UoE6jw1lw0ZcMv6205aj+88XH/8s+9+/C +5BHWJwA5aiPpXQqbE1fSqpkq5YWHUQ1+UVinrg3OwvHKIajPyUrvj/jdehsi0GiI +JManJyE3ddhjcncXk1JXgYKhwjp6FxRWccITJHkRMgqI9Uj3V8bmiCNV771sd9H2 +njQUnTmuO7erK2OtsOVyFgZT4lHjJGV2WiHZoaBkh/ujGj4NGW0gym9HDrzM1IGN +vIlMyG9lz3+Bkms0FS2EsWlWQkpwgqXy7YRSnwKyL/T7TZFq5Ln6rEd0NckgOU6T +JxqKc1EdLBavw4NlsoUPQijcXRmKbQN1XQHyvtByDetGTLod11Md5lLEOKQSZDzL +71AjR7oL8JJrqK7Q6W6DotCORtEdr1fjvbNZqrUPbgDQlRCLtDlyiJu6K1AyPg7F +w74/y8zNJQ2h8qc1NHALy7MXG0XYxJb6yWOjYkSp4U3PY2yKglsWDPZwh2jQW4B+ +VRycPFMgEnKWm43cHeSNlDkMi9XzUbfypp64TWXFLmN3C1ng3xhojpsoztVf278C ++/rv9681hwN/kbbvpKUBooiW6dqkYZ6Vq0OjboAvSn2simvHOVI7k8IJPPp1oHwh +IRzq6I5fHbK2SPzjs9o+ +=GQ5p +-END PGP SIGNATURE- Added: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 == --- release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 (added) +++ release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 Sat Oct 10 11:20:35 2015 @@ -0,0 +1 @@ +8e4e47876a8ddb566d040592dc279392 Propchange: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r1707405 - /maven/shared/tags/maven-dependency-tree-3.0/
Author: bimargulies Date: Wed Oct 7 21:59:00 2015 New Revision: 1707405 URL: http://svn.apache.org/viewvc?rev=1707405&view=rev Log: [maven-release-plugin] copy for tag maven-dependency-tree-3.0 Added: maven/shared/tags/maven-dependency-tree-3.0/ - copied from r1707404, maven/shared/trunk/maven-dependency-tree/
svn commit: r1707404 - /maven/shared/trunk/maven-dependency-tree/pom.xml
Author: bimargulies Date: Wed Oct 7 21:58:47 2015 New Revision: 1707404 URL: http://svn.apache.org/viewvc?rev=1707404&view=rev Log: [maven-release-plugin] prepare release maven-dependency-tree-3.0 Modified: maven/shared/trunk/maven-dependency-tree/pom.xml Modified: maven/shared/trunk/maven-dependency-tree/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1707404&r1=1707403&r2=1707404&view=diff == --- maven/shared/trunk/maven-dependency-tree/pom.xml (original) +++ maven/shared/trunk/maven-dependency-tree/pom.xml Wed Oct 7 21:58:47 2015 @@ -28,15 +28,15 @@ maven-dependency-tree - 3.0-SNAPSHOT + 3.0 Apache Maven Dependency Tree A tree-based API for resolution of Maven project dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/ - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/ - http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/ + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-3.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-3.0 + http://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-tree-3.0 jira
svn commit: r1707406 - /maven/shared/trunk/maven-dependency-tree/pom.xml
Author: bimargulies Date: Wed Oct 7 21:59:01 2015 New Revision: 1707406 URL: http://svn.apache.org/viewvc?rev=1707406&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-dependency-tree/pom.xml Modified: maven/shared/trunk/maven-dependency-tree/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1707406&r1=1707405&r2=1707406&view=diff == --- maven/shared/trunk/maven-dependency-tree/pom.xml (original) +++ maven/shared/trunk/maven-dependency-tree/pom.xml Wed Oct 7 21:59:01 2015 @@ -28,15 +28,15 @@ maven-dependency-tree - 3.0 + 3.0.1-SNAPSHOT Apache Maven Dependency Tree A tree-based API for resolution of Maven project dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-3.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-tree-3.0 - http://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-tree-3.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/ + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/ + http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/ jira
svn commit: r1707376 - in /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph: ./ internal/ traversal/
Author: bimargulies
Date: Wed Oct 7 19:58:29 2015
New Revision: 1707376
URL: http://svn.apache.org/viewvc?rev=1707376&view=rev
Log:
MDEP-509: add optional to the display of the tree when available.
Modified:
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/traversal/BuildingDependencyNodeVisitor.java
Modified:
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java?rev=1707376&r1=1707375&r2=1707376&view=diff
==
---
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java
(original)
+++
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java
Wed Oct 7 19:58:29 2015
@@ -87,4 +87,9 @@ public interface DependencyNode
* @return the string representation
*/
String toNodeString();
+
+/**
+ * @return true for an optional dependency.
+ */
+Boolean getOptional();
}
Modified:
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java?rev=1707376&r1=1707375&r2=1707376&view=diff
==
---
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
(original)
+++
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
Wed Oct 7 19:58:29 2015
@@ -42,6 +42,8 @@ public class DefaultDependencyNode imple
private List children;
+private Boolean optional;
+
/**
* Constructs the DefaultDependencyNode.
*
@@ -61,6 +63,17 @@ public class DefaultDependencyNode imple
this.versionConstraint = versionConstraint;
}
+public DefaultDependencyNode( DependencyNode parent, Artifact artifact,
String premanagedVersion,
+ String premanagedScope, String
versionConstraint, Boolean optional )
+{
+this.parent = parent;
+this.artifact = artifact;
+this.premanagedVersion = premanagedVersion;
+this.premanagedScope = premanagedScope;
+this.versionConstraint = versionConstraint;
+this.optional = optional;
+}
+
/**
* Applies the specified dependency node visitor to this dependency node
and its children.
*
@@ -139,6 +152,12 @@ public class DefaultDependencyNode imple
return versionConstraint;
}
+@Override
+public Boolean getOptional()
+{
+return optional;
+}
+
/**
* @return Stringified representation of this DependencyNode.
*/
@@ -166,7 +185,12 @@ public class DefaultDependencyNode imple
appender.append( "version selected from constraint ",
getVersionConstraint() );
}
+
appender.flush();
+if ( optional != null && optional )
+{
+buffer.append( " (optional) " );
+}
return buffer.toString();
}
Modified:
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1707376&r1=1707375&r2=1707376&view=diff
==
---
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
(original)
+++
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
Wed Oct 7 19:58:29 2015
@@ -207,9 +207,16 @@ public class Maven31DependencyGraphBuild
String premanagedVersion = null; //
DependencyManagerUtils.getPremanagedVersion( node );
String premana
svn commit: r1707033 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 12:30:06 2015 New Revision: 1707033 URL: http://svn.apache.org/viewvc?rev=1707033&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707033&r1=1707032&r2=1707033&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 12:30:06 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6 + 2.6.1-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x jira
svn commit: r1707032 - /maven/plugins/tags/maven-assembly-plugin-2.6/
Author: bimargulies Date: Tue Oct 6 12:30:00 2015 New Revision: 1707032 URL: http://svn.apache.org/viewvc?rev=1707032&view=rev Log: [maven-release-plugin] copy for tag maven-assembly-plugin-2.6 Added: maven/plugins/tags/maven-assembly-plugin-2.6/ (props changed) - copied from r1707031, maven/plugins/branches/maven-assembly-plugin-2.x/ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- --- svn:ignore (added) +++ svn:ignore Tue Oct 6 12:30:00 2015 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Oct 6 12:30:00 2015 @@ -0,0 +1,2 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691 +/maven/plugins/trunk/maven-assembly-plugin:1685886,1692379
svn commit: r1707031 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 12:29:48 2015 New Revision: 1707031 URL: http://svn.apache.org/viewvc?rev=1707031&view=rev Log: [maven-release-plugin] prepare release maven-assembly-plugin-2.6 Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707031&r1=1707030&r2=1707031&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 12:29:48 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6-SNAPSHOT + 2.6 maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 jira
svn commit: r1707027 - /maven/plugins/tags/maven-assembly-plugin-2.6/
Author: bimargulies Date: Tue Oct 6 12:20:45 2015 New Revision: 1707027 URL: http://svn.apache.org/viewvc?rev=1707027&view=rev Log: Complete a release rollback. Removed: maven/plugins/tags/maven-assembly-plugin-2.6/
svn commit: r1707025 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 12:13:20 2015 New Revision: 1707025 URL: http://svn.apache.org/viewvc?rev=1707025&view=rev Log: [maven-release-plugin] rollback the release of maven-assembly-plugin-2.6 Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707025&r1=1707024&r2=1707025&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 12:13:20 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.7-SNAPSHOT + 2.6-SNAPSHOT maven-plugin Apache Maven Assembly Plugin
svn commit: r1707021 - /maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/
Author: bimargulies Date: Tue Oct 6 12:09:55 2015 New Revision: 1707021 URL: http://svn.apache.org/viewvc?rev=1707021&view=rev Log: [maven-release-plugin] copy for tag maven-assembly-plugin-2.6 Added: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ (props changed) - copied from r1707020, maven/plugins/branches/maven-assembly-plugin-2.x/ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ -- --- svn:ignore (added) +++ svn:ignore Tue Oct 6 12:09:55 2015 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/maven-assembly-plugin-2.x/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Oct 6 12:09:55 2015 @@ -0,0 +1,2 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691 +/maven/plugins/trunk/maven-assembly-plugin:1685886,1692379
svn commit: r1707022 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 12:10:01 2015 New Revision: 1707022 URL: http://svn.apache.org/viewvc?rev=1707022&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707022&r1=1707021&r2=1707022&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 12:10:01 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6 + 2.7-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x jira
svn commit: r1707020 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 12:09:41 2015 New Revision: 1707020 URL: http://svn.apache.org/viewvc?rev=1707020&view=rev Log: [maven-release-plugin] prepare release maven-assembly-plugin-2.6 Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707020&r1=1707019&r2=1707020&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 12:09:41 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6-SNAPSHOT + 2.6 maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 jira
svn commit: r1707017 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies
Date: Tue Oct 6 11:54:14 2015
New Revision: 1707017
URL: http://svn.apache.org/viewvc?rev=1707017&view=rev
Log:
no jira: remove codehaus (and other snapshot repos) from run-its profile.
Modified:
maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707017&r1=1707016&r2=1707017&view=diff
==
--- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6
11:54:14 2015
@@ -334,29 +334,6 @@ under the License.
run-its
-
-
- codehaus.org
- http://snapshots.repository.codehaus.org
-
-false
-
-
-
-
-
- codehaus.snapshots
- http://snapshots.repository.codehaus.org
-
-
- apache.snapshots
- http://repository.apache.org/snapshots
-
-false
-
-
-
-
1.9
${project.build.directory}/it/it-project-parent
svn commit: r1707016 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 11:52:53 2015 New Revision: 1707016 URL: http://svn.apache.org/viewvc?rev=1707016&view=rev Log: [maven-release-plugin] rollback the release of maven-assembly-plugin-2.6 Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1707016&r1=1707015&r2=1707016&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 11:52:53 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6.1-SNAPSHOT + 2.6-SNAPSHOT maven-plugin Apache Maven Assembly Plugin
svn commit: r1706994 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 11:25:22 2015 New Revision: 1706994 URL: http://svn.apache.org/viewvc?rev=1706994&view=rev Log: [maven-release-plugin] prepare release maven-assembly-plugin-2.6 Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1706994&r1=1706993&r2=1706994&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 11:25:22 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6-SNAPSHOT + 2.6 maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ - http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 jira
svn commit: r1706996 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Tue Oct 6 11:25:36 2015 New Revision: 1706996 URL: http://svn.apache.org/viewvc?rev=1706996&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1706996&r1=1706995&r2=1706996&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Tue Oct 6 11:25:36 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.6 + 2.6.1-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x jira
svn commit: r1706995 - /maven/plugins/tags/maven-assembly-plugin-2.6/
Author: bimargulies Date: Tue Oct 6 11:25:35 2015 New Revision: 1706995 URL: http://svn.apache.org/viewvc?rev=1706995&view=rev Log: [maven-release-plugin] copy for tag maven-assembly-plugin-2.6 Added: maven/plugins/tags/maven-assembly-plugin-2.6/ (props changed) - copied from r1706994, maven/plugins/branches/maven-assembly-plugin-2.x/ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- --- svn:ignore (added) +++ svn:ignore Tue Oct 6 11:25:35 2015 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/tags/maven-assembly-plugin-2.6/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Oct 6 11:25:35 2015 @@ -0,0 +1,2 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691 +/maven/plugins/trunk/maven-assembly-plugin:1685886,1692379
svn commit: r1706743 - in /maven/plugins/branches/maven-assembly-plugin-2.x: ./ src/it/projects/basic-features/formats/ src/it/projects/basic-features/formats/src/assemblies/ src/main/java/org/apache/
Author: bimargulies
Date: Mon Oct 5 00:46:32 2015
New Revision: 1706743
URL: http://svn.apache.org/viewvc?rev=1706743&view=rev
Log:
MASSEMBLY-780: backport - -which required the backport of plexus archiver 3.0.1.
Modified:
maven/plugins/branches/maven-assembly-plugin-2.x/ (props changed)
maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/branches/maven-assembly-plugin-2.x/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java
Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 00:46:32 2015
@@ -1 +1,2 @@
/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691
+/maven/plugins/trunk/maven-assembly-plugin:1685886,1692379
Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1706743&r1=1706742&r2=1706743&view=diff
==
--- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Mon Oct 5
00:46:32 2015
@@ -127,7 +127,7 @@ under the License.
org.codehaus.plexus
plexus-archiver
- 2.10.2
+ 3.0.1
org.apache.maven.shared
Modified:
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml?rev=1706743&r1=1706742&r2=1706743&view=diff
==
---
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
Mon Oct 5 00:46:32 2015
@@ -31,6 +31,7 @@ under the License.
tbz2
jar
war
+tar.snappy
false
Modified:
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh?rev=1706743&r1=1706742&r2=1706743&view=diff
==
---
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.x/src/it/projects/basic-features/formats/verify.bsh
Mon Oct 5 00:46:32 2015
@@ -132,4 +132,16 @@ catch( IOException e )
result = false;
}
+try
+{
+File assembly = new File( basedir,
"target/assemblies/format-test-1.0.tar.snappy" );
+result = result && assembly.exists();
+result = result && assembly.isFile();
+}
+catch( IOException e )
+{
+e.printStackTrace();
+result = false;
+}
+
return result;
Modified:
maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1706743&r1=1706742&r2=1706743&view=diff
==
---
maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/branches/maven-assembly-plugin-2.x/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Mon Oct 5 00:46:32 2015
@@ -495,7 +495,7 @@ public class DefaultAssemblyArchiver
{
TarArchiver.TarCompressionMethod tarCompressionMethod;
// TODO: this should accept gz and bz2 as well so we can skip
-// over the switch
+// TODO: over the switch
final String compression = format.substring( index + 1 );
if ( "gz".equals(
svn commit: r1706728 - /maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml
Author: bimargulies Date: Sun Oct 4 21:28:00 2015 New Revision: 1706728 URL: http://svn.apache.org/viewvc?rev=1706728&view=rev Log: fix scm for improved branch path in svn. Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml?rev=1706728&r1=1706727&r2=1706728&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.x/pom.xml Sun Oct 4 21:28:00 2015 @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.5/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.5/ - http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.5 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.x/ + http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.x jira
svn commit: r1706727 - in /maven/plugins/branches: maven-assembly-plugin-2.5/ maven-assembly-plugin-2.x/
Author: bimargulies Date: Sun Oct 4 21:26:06 2015 New Revision: 1706727 URL: http://svn.apache.org/viewvc?rev=1706727&view=rev Log: fix name of branch Added: maven/plugins/branches/maven-assembly-plugin-2.x/ (props changed) - copied from r1706726, maven/plugins/branches/maven-assembly-plugin-2.5/ Removed: maven/plugins/branches/maven-assembly-plugin-2.5/ Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 4 21:26:06 2015 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/branches/maven-assembly-plugin-2.x/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 4 21:26:06 2015 @@ -0,0 +1 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691
svn commit: r1706726 - /maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml
Author: bimargulies Date: Sun Oct 4 21:25:35 2015 New Revision: 1706726 URL: http://svn.apache.org/viewvc?rev=1706726&view=rev Log: set up on branch. Modified: maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml Modified: maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml?rev=1706726&r1=1706725&r2=1706726&view=diff == --- maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml (original) +++ maven/plugins/branches/maven-assembly-plugin-2.5/pom.xml Sun Oct 4 21:25:35 2015 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.5.5 + 2.6-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.5 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.5/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.5/ + http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.5 jira
svn commit: r1706725 - /maven/plugins/branches/maven-assembly-plugin-2.5/
Author: bimargulies Date: Sun Oct 4 21:22:41 2015 New Revision: 1706725 URL: http://svn.apache.org/viewvc?rev=1706725&view=rev Log: create a 2.5.x branch for the maven-assembly-plugin. Added: maven/plugins/branches/maven-assembly-plugin-2.5/ (props changed) - copied from r1706724, maven/plugins/tags/maven-assembly-plugin-2.5.5/ Propchange: maven/plugins/branches/maven-assembly-plugin-2.5/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/branches/maven-assembly-plugin-2.5/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/branches/maven-assembly-plugin-2.5/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/branches/maven-assembly-plugin-2.5/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 4 21:22:41 2015 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/branches/maven-assembly-plugin-2.5/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 4 21:22:41 2015 @@ -0,0 +1 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691
svn commit: r1692379 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/basic-features/formats/ it/projects/basic-features/formats/src/assemblies/ main/java/org/apache/maven/plugins/asse
Author: bimargulies
Date: Thu Jul 23 11:39:31 2015
New Revision: 1692379
URL: http://svn.apache.org/r1692379
Log:
MASSEMBLY-780: add .tar.snappy.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml?rev=1692379&r1=1692378&r2=1692379&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
Thu Jul 23 11:39:31 2015
@@ -31,6 +31,7 @@ under the License.
tbz2
jar
war
+tar.snappy
false
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh?rev=1692379&r1=1692378&r2=1692379&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
Thu Jul 23 11:39:31 2015
@@ -132,4 +132,16 @@ catch( IOException e )
result = false;
}
+try
+{
+File assembly = new File( basedir,
"target/assemblies/format-test-1.0.tar.snappy" );
+result = result && assembly.exists();
+result = result && assembly.isFile();
+}
+catch( IOException e )
+{
+e.printStackTrace();
+result = false;
+}
+
return result;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java?rev=1692379&r1=1692378&r2=1692379&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
Thu Jul 23 11:39:31 2015
@@ -496,7 +496,7 @@ public class DefaultAssemblyArchiver
{
TarArchiver.TarCompressionMethod tarCompressionMethod;
// TODO: this should accept gz and bz2 as well so we can skip
-// over the switch
+// TODO: over the switch
final String compression = format.substring( index + 1 );
if ( "gz".equals( compression ) )
{
@@ -505,6 +505,9 @@ public class DefaultAssemblyArchiver
else if ( "bz2".equals( compression ) )
{
tarCompressionMethod = TarArchiver.TarCompressionMethod.bzip2;
+} else if ( "snappy".equals( compression ) )
+{
+tarCompressionMethod = TarArchiver.TarCompressionMethod.snappy;
}
else
{
svn commit: r1691062 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
Author: bimargulies Date: Tue Jul 14 19:06:43 2015 New Revision: 1691062 URL: http://svn.apache.org/r1691062 Log: MASSEMBLY-777: revert for more thought. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java?rev=1691062&r1=1691061&r2=1691062&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java Tue Jul 14 19:06:43 2015 @@ -164,7 +164,8 @@ public class AddFileSetsTask task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() ); final List excludes = fileSet.getExcludes(); -// MASSEMBLY-777: before 3.0.0, this forced an exclude for *.filtered and *.formatted +excludes.add( "**/*.filtered" ); +excludes.add( "**/*.formatted" ); task.setExcludes( excludes ); task.setIncludes( fileSet.getIncludes() );
svn commit: r1690987 - /maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml
Author: bimargulies Date: Tue Jul 14 15:28:33 2015 New Revision: 1690987 URL: http://svn.apache.org/r1690987 Log: no jira: update to fluido site. Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml?rev=1690987&r1=1690986&r2=1690987&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml Tue Jul 14 15:28:33 2015 @@ -21,7 +21,35 @@ under the License. http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 + http://maven.apache.org/xsd/decoration-1.0.0.xsd";> + + +http://maven.apache.org/images/apache-maven-project.png +http://www.apache.org/ + + + +http://maven.apache.org/images/maven-logo-black-on-white.png +http://maven.apache.org/ + + + + org.apache.maven.skins +maven-fluido-skin +1.4 + + + + + true + + + + + + +
svn commit: r1690973 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
Author: bimargulies Date: Tue Jul 14 15:11:50 2015 New Revision: 1690973 URL: http://svn.apache.org/r1690973 Log: MASSEMBLY-777: The assembly plugin refuses to copy a file named lexicon.filtered o AddFileSetsTask.java contained an undocumented, unconfigurable, exclusion for files named *.filtered and *.formatted. Since this is going into a major (3.0.0) release, I'm removing it without further ceremony. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java?rev=1690973&r1=1690972&r2=1690973&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java Tue Jul 14 15:11:50 2015 @@ -164,8 +164,7 @@ public class AddFileSetsTask task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() ); final List excludes = fileSet.getExcludes(); -excludes.add( "**/*.filtered" ); -excludes.add( "**/*.formatted" ); +// MASSEMBLY-777: before 3.0.0, this forced an exclude for *.filtered and *.formatted task.setExcludes( excludes ); task.setIncludes( fileSet.getIncludes() );
svn commit: r1690562 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/ site/apt/examples/ test/java/org/apache/maven/plugins/shade/resource/
Author: bimargulies
Date: Mon Jul 13 02:07:43 2015
New Revision: 1690562
URL: http://svn.apache.org/r1690562
Log:
MSHADE-190: Shade does not relocate the contents of META-INF/services files
o enhance ServicesResourceTransformer to include relocation.
Added:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
(with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java?rev=1690562&r1=1690561&r2=1690562&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
Mon Jul 13 02:07:43 2015
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.shade.r
* under the License.
*/
+import com.google.common.base.Charsets;
+import com.google.common.io.LineReader;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.plugins.shade.relocation.Relocator;
import org.codehaus.plexus.util.IOUtil;
@@ -26,6 +29,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.StringReader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,13 +37,11 @@ import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
/**
- * Resources transformer that appends entries in META-INF/services resources
into
+ * Resources transformer that relocates classes in META-INF/services and
appends entries in META-INF/services resources into
* a single resource. For example, if there are several
META-INF/services/org.apache.maven.project.ProjectBuilder
* resources spread across many JARs the individual entries will all be
concatenated into a single
* META-INF/services/org.apache.maven.project.ProjectBuilder resource packaged
into the resultant JAR produced
* by the shading process.
- *
- * @author jvanzyl
*/
public class ServicesResourceTransformer
implements ResourceTransformer
@@ -59,7 +61,7 @@ public class ServicesResourceTransformer
return false;
}
-public void processResource( String resource, InputStream is,
List relocators )
+public void processResource( String resource, InputStream is, final
List relocators )
throws IOException
{
ServiceStream out = serviceEntries.get( resource );
@@ -69,10 +71,24 @@ public class ServicesResourceTransformer
serviceEntries.put( resource, out );
}
-out.append( is );
+final ServiceStream fout = out;
+
+final String content = IOUtils.toString( is );
+StringReader reader = new StringReader( content );
+LineReader lineReader = new LineReader( reader );
+String line;
+while ( ( line = lineReader.readLine() ) != null )
+{
+String relContent = line;
+for ( Relocator relocator : relocators )
+{
+relContent = relocator.applyToSourceContent( relContent );
+}
+fout.append( relContent + "\n" );
+}
+
is.close();
}
-
public boolean hasTransformedResource()
{
return serviceEntries.size() > 0;
@@ -101,7 +117,7 @@ public class ServicesResourceTransformer
super( 1024 );
}
-public void append( InputStream is )
+public void append( String content )
throws IOException
{
if ( count > 0 && buf[count - 1] != '\n' && buf[count - 1] != '\r'
)
@@ -109,7 +125,8 @@ public class ServicesResourceTransformer
write( '\n' );
}
-IOUtil.copy( is, this );
+byte[] contentBytes = content.getBytes( Charsets.UTF_8 );
+this.write( contentBytes );
}
public InputStream toInputStream()
Modified:
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm?rev=1690562&r1=1690561&r2=1690562&view=diff
===
svn commit: r1666428 - /maven/site/trunk/content/apt/plugins/index.apt
Author: bimargulies
Date: Fri Mar 13 12:46:45 2015
New Revision: 1666428
URL: http://svn.apache.org/r1666428
Log:
Update archetype
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1666428&r1=1666427&r2=1666428&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Fri Mar 13 12:46:45 2015
@@ -133,7 +133,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-antrun-plugin/} <<>>}} | B |
1.8 | 2014-12-26 | Run a set of ant tasks from a phase of the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-antrun-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MANTRUN}JIRA}}
*--++--++--+++
-| {{{/archetype/maven-archetype-plugin/} <<>>}} | B |
2.2 | 2011-11-19 | Generate a skeleton project structure from an
archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
+| {{{/archetype/maven-archetype-plugin/} <<>>}} | B |
2.3 | 2014-03-13 | Generate a skeleton project structure from an
archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-assembly-plugin/} <<>>}} | B |
2.5.3| 2014-12-17 | Build an assembly (distribution) of sources and/or
binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*--++--++--+++
svn commit: r8277 - /release/maven/archetype/
Author: bimargulies Date: Fri Mar 13 12:39:33 2015 New Revision: 8277 Log: Release archetype 2.3 Added: release/maven/archetype/maven-archetype-2.3-source-release.zip (with props) release/maven/archetype/maven-archetype-2.3-source-release.zip.asc release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 (with props) release/maven/archetype/maven-archetype-2.3-source-release.zip.sha Removed: release/maven/archetype/maven-archetype-2.2-source-release.zip release/maven/archetype/maven-archetype-2.2-source-release.zip.asc release/maven/archetype/maven-archetype-2.2-source-release.zip.md5 Added: release/maven/archetype/maven-archetype-2.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/archetype/maven-archetype-2.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/archetype/maven-archetype-2.3-source-release.zip.asc == --- release/maven/archetype/maven-archetype-2.3-source-release.zip.asc (added) +++ release/maven/archetype/maven-archetype-2.3-source-release.zip.asc Fri Mar 13 12:39:33 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJU/YeBAAoJEJxPfp2YscxTBLoP/21034rd7vog0UTLqZjBeXby +qNN/dqBz7ik9KWifJOxhQbHj/CEgDF9SL71ULBdEevtnhzBpVhtz9bdKcPxy3mOU +PKD/QUTEtislirAXZZ62Ctz2xmn7jbkA8wrT+1H6z15Ibv1PlIRT8zznXRp9zfQF +5d60PedvEtmX5WDtAiVgSHNRAQHYtKiEN5tMAGOoue0jA33ELPKioq8ym2tEsq8V +04E6c7HMZmQ5ArLAl6w6sFWbFrvGxJ/pld2ZLNtuRs+GzhpSyw7CbqYWX3C5whrq +fTDGQ7RybYSYxyAP41CpjtkgjLDkV3HH7d34llpWkCGnQQJhzLW3PN0So9Kkvy1t +XCoMdlHs9tjglUGu3oF9bDn9jwy8dMVZUbbe/l2c6qN4LfiUvyFIyJJG9pfip/L3 +i9UdzxdVfmqYel0Mdcozc1QjKUSt1yZB7mhoLtD9NRZe1eTa6x6XGWyk2nZknFpR +2eBKDWdpGmfsUvfKwsmVylDTcnH1dFoPCTRQ1jy3qZaj98x2Y8FX3PljtYhkQdfy +UpAnG+FnnLFsnjGt9eOli3u1Pjhy3OLCdrXyHjV89A6XsAcvw8mZv3HsuxcTmkFr +nIEiHyNX9p2/0OF5wcJJoNDa0UMIvKC6rzrmAo75kXXUvV1g5PSzxaKxnaBnv44y +GW9SY4hedNrz+5zLd89q +=Ld3p +-END PGP SIGNATURE- Added: release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 == --- release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 (added) +++ release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 Fri Mar 13 12:39:33 2015 @@ -0,0 +1 @@ +MD5 (maven-archetype-2.3-source-release.zip) = 40c295ee0f94a61bc7d308d6b65ddd2c Propchange: release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/archetype/maven-archetype-2.3-source-release.zip.md5 -- svn:mime-type = text/plain Added: release/maven/archetype/maven-archetype-2.3-source-release.zip.sha == --- release/maven/archetype/maven-archetype-2.3-source-release.zip.sha (added) +++ release/maven/archetype/maven-archetype-2.3-source-release.zip.sha Fri Mar 13 12:39:33 2015 @@ -0,0 +1 @@ +b95a09d03765e90d540e736c3ff8a28721288660 maven-archetype-2.3-source-release.zip
svn commit: r1659111 - /maven/archetype/trunk/README-MOVED-GIT.md
Author: bimargulies Date: Thu Feb 12 00:10:10 2015 New Revision: 1659111 URL: http://svn.apache.org/r1659111 Log: No jira: add pointer to git. Added: maven/archetype/trunk/README-MOVED-GIT.md (with props) Added: maven/archetype/trunk/README-MOVED-GIT.md URL: http://svn.apache.org/viewvc/maven/archetype/trunk/README-MOVED-GIT.md?rev=1659111&view=auto == --- maven/archetype/trunk/README-MOVED-GIT.md (added) +++ maven/archetype/trunk/README-MOVED-GIT.md Thu Feb 12 00:10:10 2015 @@ -0,0 +1,5 @@ +# maven-archetype is now in git # + +See https://git-wip-us.apache.org/repos/asf?p=maven-archetype.git;a=summary + + Propchange: maven/archetype/trunk/README-MOVED-GIT.md -- svn:eol-style = native Propchange: maven/archetype/trunk/README-MOVED-GIT.md -- svn:mime-type = text/plain
svn commit: r1658283 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
Author: bimargulies
Date: Mon Feb 9 01:04:18 2015
New Revision: 1658283
URL: http://svn.apache.org/r1658283
Log:
* no jira
* removed some warnings.
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java?rev=1658283&r1=1658282&r2=1658283&view=diff
==
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
Mon Feb 9 01:04:18 2015
@@ -78,7 +78,7 @@ public class MavenArchetypeMojo
/**
* Maven's local repository.
*
- * @parameter expression="${localRepository}"
+ * @parameter property="localRepository"
* @required
*/
private ArtifactRepository localRepository;
@@ -86,7 +86,7 @@ public class MavenArchetypeMojo
/**
* The Archetype Group Id to be used.
*
- * @parameter expression="${archetypeGroupId}"
default-value="org.apache.maven.archetypes"
+ * @parameter property="archetypeGroupId"
default-value="org.apache.maven.archetypes"
* @required
*/
private String archetypeGroupId;
@@ -94,7 +94,7 @@ public class MavenArchetypeMojo
/**
* The Archetype Artifact Id to be used.
*
- * @parameter expression="${archetypeArtifactId}"
default-value="maven-archetype-quickstart"
+ * @parameter property="archetypeArtifactId"
default-value="maven-archetype-quickstart"
* @required
*/
private String archetypeArtifactId;
@@ -102,7 +102,7 @@ public class MavenArchetypeMojo
/**
* The Archetype Version to be used.
*
- * @parameter expression="${archetypeVersion}" default-value="RELEASE"
+ * @parameter property="archetypeVersion" default-value="RELEASE"
* @required
*/
private String archetypeVersion;
@@ -110,21 +110,21 @@ public class MavenArchetypeMojo
/**
* The Group Id of the project to be build.
*
- * @parameter expression="${groupId}"
+ * @parameter property="groupId"
*/
private String groupId;
/**
* The Artifact Id of the project to be build.
*
- * @parameter expression="${artifactId}"
+ * @parameter property="artifactId"
*/
private String artifactId;
/**
* The Version of the project to be build.
*
- * @parameter expression="${version}" default-value="1.0-SNAPSHOT"
+ * @parameter property="version" default-value="1.0-SNAPSHOT"
* @required
*/
private String version;
@@ -132,7 +132,7 @@ public class MavenArchetypeMojo
/**
* The Package Name of the project to be build.
*
- * @parameter expression="${packageName}" alias="package"
+ * @parameter property="packageName" alias="package"
*/
private String packageName;
@@ -140,7 +140,7 @@ public class MavenArchetypeMojo
* The remote repositories available for discovering dependencies and
extensions as indicated
* by the POM.
*
- * @parameter expression="${project.remoteArtifactRepositories}"
+ * @parameter property="project.remoteArtifactRepositories"
* @required
*/
private List pomRemoteRepositories;
@@ -148,19 +148,19 @@ public class MavenArchetypeMojo
/**
* Other remote repositories available for discovering dependencies and
extensions.
*
- * @parameter expression="${remoteRepositories}"
+ * @parameter property="remoteRepositories"
*/
private String remoteRepositories;
/**
* The project to be created an archetype of.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
*/
private MavenProject project;
/**
- * @parameter expression="${basedir}" default-value="${user.dir}"
+ * @parameter property="basedir" default-value="${user.dir}"
*/
private String basedir;
svn commit: r1656610 - in /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui: ./ creation/ generation/
Author: bimargulies Date: Tue Feb 3 00:34:48 2015 New Revision: 1656610 URL: http://svn.apache.org/r1656610 Log: ARCHETYPE-182: OK, add hints. Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=1656610&r1=1656609&r2=1656610&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java Tue Feb 3 00:34:48 2015 @@ -29,7 +29,7 @@ import org.codehaus.plexus.logging.Abstr import java.util.Iterator; import java.util.Properties; -@Component( role = ArchetypeFactory.class ) +@Component( role = ArchetypeFactory.class, hint = "default" ) public class DefaultArchetypeFactory extends AbstractLogEnabled implements ArchetypeFactory Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java?rev=1656610&r1=1656609&r2=1656610&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java Tue Feb 3 00:34:48 2015 @@ -47,7 +47,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -@Component( role = ArchetypeCreationConfigurator.class ) +@Component( role = ArchetypeCreationConfigurator.class, hint = "default" ) public class DefaultArchetypeCreationConfigurator extends AbstractLogEnabled implements ArchetypeCreationConfigurator Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java?rev=1656610&r1=1656609&r2=1656610&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java Tue Feb 3 00:34:48 2015 @@ -29,7 +29,7 @@ import org.codehaus.plexus.logging.Abstr import java.util.Iterator; -@Component( role = ArchetypeCreationQueryer.class ) +@Component( role = ArchetypeCreationQueryer.class, hint = "default" ) public class DefaultArchetypeCreationQueryer extends AbstractLogEnabled implements ArchetypeCreationQueryer Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java?rev=1656610&r1=1656609&r2=1656610&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/ap
svn commit: r1656604 - in /maven/archetype/trunk/maven-archetype-plugin: pom.xml src/site/apt/usage.apt
Author: bimargulies
Date: Mon Feb 2 23:55:30 2015
New Revision: 1656604
URL: http://svn.apache.org/r1656604
Log:
ARCHETYPE-435: remove old line
ARCHETYPE-475: bump prereq.
Modified:
maven/archetype/trunk/maven-archetype-plugin/pom.xml
maven/archetype/trunk/maven-archetype-plugin/src/site/apt/usage.apt
Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=1656604&r1=1656603&r2=1656604&view=diff
==
--- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Mon Feb 2 23:55:30
2015
@@ -46,7 +46,7 @@
-2.0.7
+2.2.1
Modified: maven/archetype/trunk/maven-archetype-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/site/apt/usage.apt?rev=1656604&r1=1656603&r2=1656604&view=diff
==
--- maven/archetype/trunk/maven-archetype-plugin/src/site/apt/usage.apt
(original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/site/apt/usage.apt Mon Feb
2 23:55:30 2015
@@ -191,11 +191,3 @@ $ mvn archetype:generate
[]
-Backward compatibility
-
-For backward compatibility with the Archetype Plugin version 1.0-alpha-7,
-we kept the old <<>> goal which can be called using
-<<>>.
-
-See
{{{http://maven.apache.org/plugins/maven-archetype-plugin-1.0-alpha-7/index.html}the
old documentation}} for further
-reading.
svn commit: r1656583 - in /maven/archetype/trunk: ./ archetype-common/ archetype-common/src/test/java/org/apache/maven/archetype/old/ archetype-common/src/test/java/org/apache/maven/archetype/old/desc
Author: bimargulies
Date: Mon Feb 2 21:22:42 2015
New Revision: 1656583
URL: http://svn.apache.org/r1656583
Log:
ARCHETYPE-471: update maven baseline to 2.2.1.
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1656583&r1=1656582&r2=1656583&view=diff
==
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Mon Feb 2 21:22:42 2015
@@ -195,13 +195,6 @@
-site-docs
-pre-site
-
- xdoc
-
-
-
site-xsd
pre-site
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
Mon Feb 2 21:22:42 2015
@@ -66,15 +66,15 @@ public class ArchetypeTest
//
--
ArtifactRepositoryLayout layout =
-(ArtifactRepositoryLayout) container.lookup(
ArtifactRepositoryLayout.ROLE, "legacy" );
+(ArtifactRepositoryLayout) getContainer().lookup(
ArtifactRepositoryLayout.ROLE, "legacy" );
-String mavenRepoLocal = getTestFile( "target/local-repository"
).toURL().toString();
+String mavenRepoLocal = getTestFile( "target/local-repository"
).toURI().toURL().toString();
ArtifactRepository localRepository = new DefaultArtifactRepository(
"local", mavenRepoLocal, layout );
List remoteRepositories = new
ArrayList();
-String mavenRepoRemote = getTestFile( "src/test/repository"
).toURL().toString();
+String mavenRepoRemote = getTestFile( "src/test/repository"
).toURI().toURL().toString();
ArtifactRepository remoteRepository = new DefaultArtifactRepository(
"remote", mavenRepoRemote, layout );
@@ -214,7 +214,7 @@ public class ArchetypeTest
{
URL[] urls = new URL[1];
-urls[0] = archetypeArtifact.getFile().toURL();
+urls[0] = archetypeArtifact.getFile().toURI().toURL();
archetypeJarLoader = new URLClassLoader( urls );
}
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
Mon Feb 2 21:22:42 2015
@@ -41,7 +41,7 @@ public class ArchetypeXsdTest
public void testXsd()
throws Exception
{
-File archetypeXsd = new File( getBasedir(),
"/target/generated-site/xsd/" + ARCHETYPE_XSD );
+File archetypeXsd = new File( getBasedir(),
"/target/generated-site/resources/xsd/" + ARCHETYPE_XSD );
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setValidating( true );
Modified:
maven/archetype/tr
svn commit: r1656367 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/mcompiler-120/pom.xml site/apt/examples/pass-compiler-arguments.apt.vm
Author: bimargulies
Date: Sun Feb 1 22:12:18 2015
New Revision: 1656367
URL: http://svn.apache.org/r1656367
Log:
MCOMPILER-120: switch doc for compiler options to current working syntax, clean
up confusion in it.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml?rev=1656367&r1=1656366&r2=1656367&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml Sun
Feb 1 22:12:18 2015
@@ -52,14 +52,11 @@ under the License.
true
true
true
-
+ true
+ true
-Werror
--Xlint:all
--Xlint:-path
+-Xlint:all,-options,-path
true
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm?rev=1656367&r1=1656366&r2=1656367&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm
Sun Feb 1 22:12:18 2015
@@ -30,8 +30,8 @@ Pass Compiler Arguments
Sometimes, you need to pass other compiler arguments that are not handled by
the Compiler Plugin itself but is supported by the <<>> selected.
- For such arguments, the Compiler Plugin's <<>> will be
- used. The following example passes compiler arguments to the <<>>
+ For such arguments, use the Compiler Plugin's <<>> parameter
+ The following example passes compiler arguments to the <<>>
compiler:
+-
@@ -44,35 +44,10 @@ Pass Compiler Arguments
org.apache.maven.plugins
maven-compiler-plugin
${project.version}
-
- -verbose -bootclasspath
${java.home}\lib\rt.jar
-
-
-
-[...]
-
- [...]
-
-+-
-
- Or you can also use the Map version:
-
-+-
-
- [...]
-
-[...]
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-${project.version}
-
-
-
-${java.home}\lib\rt.jar
-
-
+
+-verbose
+-Xlint:all,-options,-path
+
[...]
svn commit: r1655484 - in /maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120: pom.xml verify.groovy
Author: bimargulies Date: Wed Jan 28 22:09:40 2015 New Revision: 1655484 URL: http://svn.apache.org/r1655484 Log: MCOMPILER-120: fix up the IT to actually test the functionality in question. Add commented out line that causes this to misbehave. Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/verify.groovy Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml?rev=1655484&r1=1655483&r2=1655484&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml Wed Jan 28 22:09:40 2015 @@ -49,10 +49,18 @@ under the License. 1.6 1.6 - -Xlint:all, -path - - - + true + true + true + + +-Werror +-Xlint:all +-Xlint:-path + true Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/verify.groovy?rev=1655484&r1=1655483&r2=1655484&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/verify.groovy (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/verify.groovy Wed Jan 28 22:09:40 2015 @@ -22,3 +22,6 @@ assert logFile.exists() content = logFile.text assert content.contains( 'Compilation failure' ) +assert !content.contains( 'invalid flag' ) +assert content.contains( 'unchecked call to add(E) as a member of the raw type List' ) +
svn commit: r1628065 - /maven/pom/trunk/maven/pom.xml
Author: bimargulies Date: Sun Sep 28 11:24:23 2014 New Revision: 1628065 URL: http://svn.apache.org/r1628065 Log: (no jira) update maven project pom to asf 15. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1628065&r1=1628064&r2=1628065&view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun Sep 28 11:24:23 2014 @@ -26,7 +26,7 @@ under the License. org.apache apache -14 +15 ../asf/pom.xml @@ -39,13 +39,6 @@ under the License. Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information. http://maven.apache.org/ 2002 - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - @@ -891,7 +884,7 @@ under the License. org.apache.maven.plugins maven-release-plugin - 2.5 + 2.5.1 true apache-release,rat
svn commit: r6676 - in /release/maven/pom: apache-14-source-release.zip apache-14-source-release.zip.asc apache-14-source-release.zip.md5 apache-15-source-release.zip apache-15-source-release.zip.asc
Author: bimargulies Date: Sun Sep 28 11:20:48 2014 New Revision: 6676 Log: Distro files for release 15 of org.apache:apache. Added: release/maven/pom/apache-15-source-release.zip (with props) release/maven/pom/apache-15-source-release.zip.asc release/maven/pom/apache-15-source-release.zip.md5 (with props) Removed: release/maven/pom/apache-14-source-release.zip release/maven/pom/apache-14-source-release.zip.asc release/maven/pom/apache-14-source-release.zip.md5 Added: release/maven/pom/apache-15-source-release.zip == Binary file - no diff available. Propchange: release/maven/pom/apache-15-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/pom/apache-15-source-release.zip.asc == --- release/maven/pom/apache-15-source-release.zip.asc (added) +++ release/maven/pom/apache-15-source-release.zip.asc Sun Sep 28 11:20:48 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJUItS3AAoJEJxPfp2YscxT1nAP/jSAUyyirlqUWsWkDzbF7VxR +Kc+17BJw6D28/00P22hCuL6rLO5mXAjXzlghuM8csOavHNvPZshA02pPFq6Y4iM7 +8C7tEbrTgdRWKBmQHhgkpA97WnkDpbtqtP1NbYGBhiVMncfXohbQPKnjzu7K5Uf8 +kOdGr8KMhANUieE5jUO7wd1lq2R0wCqztZJcwG0T0+ZZ3sLb8YWGbisejibWOhtD +nC5gey61MlQu5dP1xuJNZoDBeWDn0D/x3oh8QjvjXKsunz0QYNS+ElnuSsoewLlJ +vzFw5x5BQbmAVjUgbhrK4fLCHCl/rx9/N6PJUkgoROleszgzoqSAHRzAza7gmE6N +WE0mxBJPtyA3aQugQqVYG6M1eFrjKOwxOQbUaNCOmnHNEvys8rIp9EwxqfiniakL +nGUkTpu2H6F1HQu7/boLUa8xadkGP4Y358QMNRqgqmiycqAMYK3KyGy49z7mB9EC +qF2/vUVZTMJJcgXsCNMXV+tTLpIVRqUN8zcvLSu9Qvw7qiArQd8isPcK9gwbk73t +SqCsEdH0v9gi8wW8qN0xg9FPpsl4P8ZRFWLDZ1PYyOSg4hdF5lzhMV3HWvI1269W +oaKHP4M2Khmu8+BSrpp74oRZD0pRxWdoaY4c4+QIjICgw0N9Pfa1gBhEepj5BqDt +UKMvABK6SqjRDde+HbPO +=7Vm1 +-END PGP SIGNATURE- Added: release/maven/pom/apache-15-source-release.zip.md5 == --- release/maven/pom/apache-15-source-release.zip.md5 (added) +++ release/maven/pom/apache-15-source-release.zip.md5 Sun Sep 28 11:20:48 2014 @@ -0,0 +1 @@ +0a766e8728264a3c542ef4afca549001 Propchange: release/maven/pom/apache-15-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/pom/apache-15-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r923400 - /websites/production/maven/content/pom-archives/asf-LATEST/
Author: bimargulies
Date: Wed Sep 24 14:28:19 2014
New Revision: 923400
Log:
Site checkin for project Apache Software Foundation Parent POM
Modified:
websites/production/maven/content/pom-archives/asf-LATEST/dependencies.html
websites/production/maven/content/pom-archives/asf-LATEST/dependency-info.html
websites/production/maven/content/pom-archives/asf-LATEST/distribution-management.html
websites/production/maven/content/pom-archives/asf-LATEST/download.html
websites/production/maven/content/pom-archives/asf-LATEST/index.html
websites/production/maven/content/pom-archives/asf-LATEST/integration.html
websites/production/maven/content/pom-archives/asf-LATEST/issue-tracking.html
websites/production/maven/content/pom-archives/asf-LATEST/license.html
websites/production/maven/content/pom-archives/asf-LATEST/mail-lists.html
websites/production/maven/content/pom-archives/asf-LATEST/plugin-management.html
websites/production/maven/content/pom-archives/asf-LATEST/plugins.html
websites/production/maven/content/pom-archives/asf-LATEST/project-info.html
websites/production/maven/content/pom-archives/asf-LATEST/project-summary.html
websites/production/maven/content/pom-archives/asf-LATEST/source-repository.html
websites/production/maven/content/pom-archives/asf-LATEST/team-list.html
Modified:
websites/production/maven/content/pom-archives/asf-LATEST/dependencies.html
==
--- websites/production/maven/content/pom-archives/asf-LATEST/dependencies.html
(original)
+++ websites/production/maven/content/pom-archives/asf-LATEST/dependencies.html
Wed Sep 24 14:28:19 2014
@@ -1,6 +1,6 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml";>
@@ -12,7 +12,7 @@
@import url("./css/site.css");
-
+
http://www.google-analytics.com/urchin.js"</a>;
type="text/javascript">
@@ -46,7 +46,7 @@
Project Dependencies
-Last Published: 2014-09-22
+Last Published: 2014-09-24
 | Version: 15
Modified:
websites/production/maven/content/pom-archives/asf-LATEST/dependency-info.html
==
---
websites/production/maven/content/pom-archives/asf-LATEST/dependency-info.html
(original)
+++
websites/production/maven/content/pom-archives/asf-LATEST/dependency-info.html
Wed Sep 24 14:28:19 2014
@@ -1,6 +1,6 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml";>
@@ -12,7 +12,7 @@
@import url("./css/site.css");
-
+
http://www.google-analytics.com/urchin.js"</a>;
type="text/javascript">
@@ -46,7 +46,7 @@
Dependency Information
-Last Published: 2014-09-22
+Last Published: 2014-09-24
 | Version: 15
Modified:
websites/production/maven/content/pom-archives/asf-LATEST/distribution-management.html
==
---
websites/production/maven/content/pom-archives/asf-LATEST/distribution-management.html
(original)
+++
websites/production/maven/content/pom-archives/asf-LATEST/distribution-management.html
Wed Sep 24 14:28:19 2014
@@ -1,6 +1,6 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml";>
@@ -12,7 +12,7 @@
@import url("./css/site.css");
-
+
http://www.google-analytics.com/urchin.js"</a>;
type="text/javascript">
@@ -46,7 +46,7 @@
Project Distribution Management
-Last Published: 2014-09-22
+Last Published: 2014-09-24
 | Version: 15
Modified:
websites/production/maven/content/pom-archives/asf-LATEST/download.html
==
--- websites/production/maven/content/pom-archives/asf-LATEST/download.html
(original)
+++ websites/production/maven/content/pom-archives/asf-LATEST/download.html Wed
Sep 24 14:28:19 2014
@@ -1,6 +1,6 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
http://www.w3.org/1999/xhtml";>
@@ -12,7 +12,7 @@
@import url("./css/site.css");
svn commit: r1627337 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Wed Sep 24 14:26:57 2014 New Revision: 1627337 URL: http://svn.apache.org/r1627337 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1627337&r1=1627336&r2=1627337&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Wed Sep 24 14:26:57 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache - 15 + 16-SNAPSHOT pom The Apache Software Foundation @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-15 - scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-15 -http://svn.apache.org/viewvc/maven/pom/tags/apache-15 + scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf + scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf +http://svn.apache.org/viewvc/maven/pom/trunk/asf
svn commit: r1627336 - /maven/pom/tags/apache-15/
Author: bimargulies Date: Wed Sep 24 14:26:56 2014 New Revision: 1627336 URL: http://svn.apache.org/r1627336 Log: [maven-release-plugin] copy for tag apache-15 Added: maven/pom/tags/apache-15/ - copied from r1627335, maven/pom/trunk/asf/
svn commit: r1627335 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Wed Sep 24 14:26:42 2014 New Revision: 1627335 URL: http://svn.apache.org/r1627335 Log: [maven-release-plugin] prepare release apache-15 Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1627335&r1=1627334&r2=1627335&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Wed Sep 24 14:26:42 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache - 15-SNAPSHOT + 15 pom The Apache Software Foundation @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf - scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf -http://svn.apache.org/viewvc/maven/pom/trunk/asf + scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-15 + scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-15 +http://svn.apache.org/viewvc/maven/pom/tags/apache-15
svn commit: r1627334 - in /maven/pom/trunk/asf: site-pom.xml src/site-docs/apt/index.apt src/site-docs/xdoc/download.xml.vm
Author: bimargulies
Date: Wed Sep 24 14:26:07 2014
New Revision: 1627334
URL: http://svn.apache.org/r1627334
Log:
Prepare for version 15, making some fixes identified by Hervé.
Modified:
maven/pom/trunk/asf/site-pom.xml
maven/pom/trunk/asf/src/site-docs/apt/index.apt
maven/pom/trunk/asf/src/site-docs/xdoc/download.xml.vm
Modified: maven/pom/trunk/asf/site-pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/site-pom.xml?rev=1627334&r1=1627333&r2=1627334&view=diff
==
--- maven/pom/trunk/asf/site-pom.xml (original)
+++ maven/pom/trunk/asf/site-pom.xml Wed Sep 24 14:26:07 2014
@@ -25,7 +25,7 @@ under the License.
org.apache
apache
-16-SNAPSHOT
+15
./pom.xml
Modified: maven/pom/trunk/asf/src/site-docs/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/apt/index.apt?rev=1627334&r1=1627333&r2=1627334&view=diff
==
--- maven/pom/trunk/asf/src/site-docs/apt/index.apt (original)
+++ maven/pom/trunk/asf/src/site-docs/apt/index.apt Wed Sep 24 14:26:07 2014
@@ -112,7 +112,7 @@ Settings Configuration
History
-{{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup}15-SNAPSHOT}}
({{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?r1=HEAD&r2=1575044&diff_format=h}diff}})
+~~{{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup}15-SNAPSHOT}}
({{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?r1=HEAD&r2=1575044&diff_format=h}diff}})
*--++
|| <> || <> ||
Modified: maven/pom/trunk/asf/src/site-docs/xdoc/download.xml.vm
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/xdoc/download.xml.vm?rev=1627334&r1=1627333&r2=1627334&view=diff
==
--- maven/pom/trunk/asf/src/site-docs/xdoc/download.xml.vm (original)
+++ maven/pom/trunk/asf/src/site-docs/xdoc/download.xml.vm Wed Sep 24 14:26:07
2014
@@ -107,9 +107,9 @@ under the License.
${project.name} ${project.version} (Source zip)
-maven/pom/${project.artifactId}-${project.version}-source-release.zip
-http://www.apache.org/dist/maven/pom/${project.artifactId}-${project.version}-source-release.zip.md5";>maven/pom/${project.artifactId}-${project.version}-source-release.zip.md5
-http://www.apache.org/dist/maven/pom/${project.artifactId}-${project.version}-source-release.zip.asc";>maven/pom/${project.artifactId}-${project.version}-source-release.zip.asc
+maven/pom/apache-${project.version}-source-release.zip
+http://www.apache.org/dist/maven/pom/apache-${project.version}-source-release.zip.md5";>maven/pom/apache-${project.version}-source-release.zip.md5
+http://www.apache.org/dist/maven/pom/apache-${project.version}-source-release.zip.asc";>maven/pom/apache-${project.version}-source-release.zip.asc
svn commit: r1627331 - /maven/pom/tags/apache-15/
Author: bimargulies Date: Wed Sep 24 14:21:53 2014 New Revision: 1627331 URL: http://svn.apache.org/r1627331 Log: Respin for 15. Removed: maven/pom/tags/apache-15/
svn commit: r1627330 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Wed Sep 24 14:21:18 2014 New Revision: 1627330 URL: http://svn.apache.org/r1627330 Log: Roll back to prepare respin of version 15. Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1627330&r1=1627329&r2=1627330&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Wed Sep 24 14:21:18 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache - 16-SNAPSHOT + 15-SNAPSHOT pom The Apache Software Foundation
svn commit: r1627329 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Wed Sep 24 14:20:47 2014 New Revision: 1627329 URL: http://svn.apache.org/r1627329 Log: Push back to javadoc 2.9.1; 2.10 is not ready for prime time. Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1627329&r1=1627328&r2=1627329&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Wed Sep 24 14:20:47 2014 @@ -187,7 +187,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 2.10 + 2.9.1 org.apache.maven.plugins
svn commit: r1626900 - /maven/pom/trunk/asf/site-pom.xml
Author: bimargulies Date: Mon Sep 22 21:29:36 2014 New Revision: 1626900 URL: http://svn.apache.org/r1626900 Log: Prepare for next release iteration. Modified: maven/pom/trunk/asf/site-pom.xml Modified: maven/pom/trunk/asf/site-pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/site-pom.xml?rev=1626900&r1=1626899&r2=1626900&view=diff == --- maven/pom/trunk/asf/site-pom.xml (original) +++ maven/pom/trunk/asf/site-pom.xml Mon Sep 22 21:29:36 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache -15-SNAPSHOT +16-SNAPSHOT ./pom.xml @@ -82,4 +82,4 @@ under the License. - \ No newline at end of file +
svn commit: r1626896 - /maven/pom/tags/apache-15/
Author: bimargulies Date: Mon Sep 22 21:18:37 2014 New Revision: 1626896 URL: http://svn.apache.org/r1626896 Log: [maven-release-plugin] copy for tag apache-15 Added: maven/pom/tags/apache-15/ - copied from r1626895, maven/pom/trunk/asf/
svn commit: r1626897 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Mon Sep 22 21:18:38 2014 New Revision: 1626897 URL: http://svn.apache.org/r1626897 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1626897&r1=1626896&r2=1626897&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Mon Sep 22 21:18:38 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache - 15 + 16-SNAPSHOT pom The Apache Software Foundation @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-15 - scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-15 -http://svn.apache.org/viewvc/maven/pom/tags/apache-15 + scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf + scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf +http://svn.apache.org/viewvc/maven/pom/trunk/asf
svn commit: r1626895 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Mon Sep 22 21:18:24 2014 New Revision: 1626895 URL: http://svn.apache.org/r1626895 Log: [maven-release-plugin] prepare release apache-15 Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1626895&r1=1626894&r2=1626895&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Mon Sep 22 21:18:24 2014 @@ -25,7 +25,7 @@ under the License. org.apache apache - 15-SNAPSHOT + 15 pom The Apache Software Foundation @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf - scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf -http://svn.apache.org/viewvc/maven/pom/trunk/asf + scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-15 + scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-15 +http://svn.apache.org/viewvc/maven/pom/tags/apache-15
svn commit: r1626879 - /maven/pom/trunk/asf/pom.xml
Author: bimargulies Date: Mon Sep 22 19:45:13 2014 New Revision: 1626879 URL: http://svn.apache.org/r1626879 Log: MPOM-58: Pom calls for yet another version of maven-release-plugin to deal with more git problems Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1626879&r1=1626878&r2=1626879&view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Mon Sep 22 19:45:13 2014 @@ -198,7 +198,7 @@ under the License. org.apache.maven.plugins maven-release-plugin - 2.5 + 2.5.1 false deploy
svn commit: r1626878 - /maven/site/trunk/content/apt/plugins/index.apt
Author: bimargulies
Date: Mon Sep 22 19:34:40 2014
New Revision: 1626878
URL: http://svn.apache.org/r1626878
Log:
Maven-release 2.5.1
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1626878&r1=1626877&r2=1626878&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Sep 22 19:34:40 2014
@@ -155,7 +155,7 @@ Available Plugins
*--++--++--+++
| {{{/plugin-tools/maven-plugin-plugin/} <<>>}}| B+R|
3.3 | 2014-05-03 | Create a Maven plugin descriptor for any mojos
found in the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-release-plugin/} <<>>}} | B |
2.5 | 2014-03-04 | Release the current project - updating the POM and
tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
+| {{{/plugins/maven-release-plugin/} <<>>}} | B |
2.5.1 | 2014-09-22 | Release the current project - updating the POM
and tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-remote-resources-plugin/} <<>>}}| B |
1.5 | 2013-08-14 | Copy remote resources to the output directory for
inclusion in the artifact. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-remote-resources-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRRESOURCES}JIRA}}
*--++--++--+++
svn commit: r6629 - /release/maven/release/
Author: bimargulies Date: Mon Sep 22 19:21:59 2014 New Revision: 6629 Log: Release maven-release-plugin 2.5.1. Added: release/maven/release/maven-release-2.5.1-source-release.zip (with props) release/maven/release/maven-release-2.5.1-source-release.zip.asc release/maven/release/maven-release-2.5.1-source-release.zip.md5 (with props) Removed: release/maven/release/maven-release-2.5-source-release.zip release/maven/release/maven-release-2.5-source-release.zip.asc release/maven/release/maven-release-2.5-source-release.zip.md5 Added: release/maven/release/maven-release-2.5.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/release/maven-release-2.5.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/release/maven-release-2.5.1-source-release.zip.asc == --- release/maven/release/maven-release-2.5.1-source-release.zip.asc (added) +++ release/maven/release/maven-release-2.5.1-source-release.zip.asc Mon Sep 22 19:21:59 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJUHIhDAAoJEJxPfp2YscxTkUUP/0uPmZAoAsfHg/PV+Wm9SSw4 +9EMwFLJvoYB8/HOPRS5SDti0MrJdQz0A2yZ46XrdozOSLDloK/khy+OnIN4yliIM +M5OGdIdHiT9DPsYwpLslCGxrlAqDhb7gZxrc3jYj8Kf3QLSYd5mdBfw1wr55cKkW +K9rBngmzwG0IVnOaYKXRDKqveiX2wirEJ+8/EbPAqSwjrUYTJca7BSIT7Lq5x3du +mPNRVbrWtBBUEaZyX8vEIToaGAI/tAbncuOHM7EwIuhK1jmRnb/IfBGJhQlNQA1L +dSH5LrvHJBwH+MjNHlT+8EcsfytChZF9MDNzu0wrjHouA1KqP0Bf2iUkVF1kRTyX +IzDnG+kl2g1I/gV+BR/iLEX+n2/Bbn+XbkOSpPpcpsWI1lDitOFOOCe0UvQZ5lIR +t3pHZWCV/PJwrPXbwRI+QL8vyvXEa2cHJ4ycEKeuryt4JzMKnyQiE3UlmoAtd7Vx +c0bzNrDJGA4oS1FPkQImcxdf406frq07SkxC9PAN5FMkWr1HU6ScD2yh2Pzm6RYz +ukVLDyD86r1ZOFPOxB2i2bOELTss9hwNz9Yrm52t6hbWWIUG987GnttcZGRHIx0g +hCT1evceuHavcABNE2I73kTqfpT5G16QlaZO4LBhQHQ4LysuEu6pMeENbcetMauC +4XEId2Xg1aQrOVnVOepr +=+tS5 +-END PGP SIGNATURE- Added: release/maven/release/maven-release-2.5.1-source-release.zip.md5 == --- release/maven/release/maven-release-2.5.1-source-release.zip.md5 (added) +++ release/maven/release/maven-release-2.5.1-source-release.zip.md5 Mon Sep 22 19:21:59 2014 @@ -0,0 +1 @@ +432313870b144315bcc6540cbdbf79bd Propchange: release/maven/release/maven-release-2.5.1-source-release.zip.md5 -- svn:eol-style = native Propchange: release/maven/release/maven-release-2.5.1-source-release.zip.md5 -- svn:mime-type = text/plain
svn commit: r1626314 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Fri Sep 19 19:46:55 2014 New Revision: 1626314 URL: http://svn.apache.org/r1626314 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1626314&r1=1626313&r2=1626314&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Fri Sep 19 19:46:55 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1626314&r1=1626313&r2=1626314&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Fri Sep 19 19:46:55 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.1 + 2.5.2-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1626314&r1=1626313&r2=1626314&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Fri Sep 19 19:46:55 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.1 + 2.5.2-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1626314&r1=1626313&r2=1626314&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Fri Sep 19 19:46:55 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1626314&r1=1626313&r2=1626314&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Sep 19 19:46:55 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.1 + 2.5.2-SNAPSHOT pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 - scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 - http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.1 + scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk +http://svn.apache.org/viewvc/maven/release/trunk jira
svn commit: r1626312 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Fri Sep 19 19:46:50 2014 New Revision: 1626312 URL: http://svn.apache.org/r1626312 Log: [maven-release-plugin] prepare release maven-release-2.5.1 Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1626312&r1=1626311&r2=1626312&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Fri Sep 19 19:46:50 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1626312&r1=1626311&r2=1626312&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Fri Sep 19 19:46:50 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.1-SNAPSHOT + 2.5.1 org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1626312&r1=1626311&r2=1626312&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Fri Sep 19 19:46:50 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.1-SNAPSHOT + 2.5.1 org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1626312&r1=1626311&r2=1626312&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Fri Sep 19 19:46:50 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1626312&r1=1626311&r2=1626312&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Sep 19 19:46:50 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.1-SNAPSHOT + 2.5.1 pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk -http://svn.apache.org/viewvc/maven/release/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 + scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 + http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.1 jira
svn commit: r1626313 - /maven/release/tags/maven-release-2.5.1/
Author: bimargulies Date: Fri Sep 19 19:46:53 2014 New Revision: 1626313 URL: http://svn.apache.org/r1626313 Log: [maven-release-plugin] copy for tag maven-release-2.5.1 Added: maven/release/tags/maven-release-2.5.1/ - copied from r1626312, maven/release/trunk/
svn commit: r1626309 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Fri Sep 19 19:46:07 2014 New Revision: 1626309 URL: http://svn.apache.org/r1626309 Log: Reset version for 2.5.1 Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1626309&r1=1626308&r2=1626309&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Fri Sep 19 19:46:07 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.1-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1626309&r1=1626308&r2=1626309&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Fri Sep 19 19:46:07 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.1-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.3-SNAPSHOT + 2.5.1-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1626309&r1=1626308&r2=1626309&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Fri Sep 19 19:46:07 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.1-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.3-SNAPSHOT + 2.5.1-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1626309&r1=1626308&r2=1626309&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Fri Sep 19 19:46:07 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.3-SNAPSHOT +2.5.1-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1626309&r1=1626308&r2=1626309&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Sep 19 19:46:07 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.3-SNAPSHOT + 2.5.1-SNAPSHOT pom Maven Release
svn commit: r1626308 - /maven/release/tags/maven-release-2.5.2/
Author: bimargulies Date: Fri Sep 19 19:44:12 2014 New Revision: 1626308 URL: http://svn.apache.org/r1626308 Log: remove error. Removed: maven/release/tags/maven-release-2.5.2/
svn commit: r1626307 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Fri Sep 19 19:39:14 2014 New Revision: 1626307 URL: http://svn.apache.org/r1626307 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1626307&r1=1626306&r2=1626307&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Fri Sep 19 19:39:14 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.2 +2.5.3-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1626307&r1=1626306&r2=1626307&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Fri Sep 19 19:39:14 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2 +2.5.3-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.2 + 2.5.3-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1626307&r1=1626306&r2=1626307&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Fri Sep 19 19:39:14 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2 +2.5.3-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.2 + 2.5.3-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1626307&r1=1626306&r2=1626307&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Fri Sep 19 19:39:14 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2 +2.5.3-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1626307&r1=1626306&r2=1626307&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Sep 19 19:39:14 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.2 + 2.5.3-SNAPSHOT pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.2 - scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.2 - http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.2 + scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk +http://svn.apache.org/viewvc/maven/release/trunk jira
svn commit: r1626305 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Fri Sep 19 19:39:09 2014 New Revision: 1626305 URL: http://svn.apache.org/r1626305 Log: [maven-release-plugin] prepare release maven-release-2.5.2 Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1626305&r1=1626304&r2=1626305&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Fri Sep 19 19:39:09 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.2-SNAPSHOT +2.5.2 maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1626305&r1=1626304&r2=1626305&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Fri Sep 19 19:39:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2-SNAPSHOT +2.5.2 maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.2-SNAPSHOT + 2.5.2 org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1626305&r1=1626304&r2=1626305&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Fri Sep 19 19:39:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2-SNAPSHOT +2.5.2 org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.2-SNAPSHOT + 2.5.2 org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1626305&r1=1626304&r2=1626305&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Fri Sep 19 19:39:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.2-SNAPSHOT +2.5.2 ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1626305&r1=1626304&r2=1626305&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Sep 19 19:39:09 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.2-SNAPSHOT + 2.5.2 pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk -http://svn.apache.org/viewvc/maven/release/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.2 + scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.2 + http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.2 jira
svn commit: r1626306 - /maven/release/tags/maven-release-2.5.2/
Author: bimargulies Date: Fri Sep 19 19:39:12 2014 New Revision: 1626306 URL: http://svn.apache.org/r1626306 Log: [maven-release-plugin] copy for tag maven-release-2.5.2 Added: maven/release/tags/maven-release-2.5.2/ - copied from r1626305, maven/release/trunk/
svn commit: r1626285 - /maven/release/tags/maven-release-2.5.1/
Author: bimargulies Date: Fri Sep 19 17:51:41 2014 New Revision: 1626285 URL: http://svn.apache.org/r1626285 Log: Remove tag from failed release cycle. Removed: maven/release/tags/maven-release-2.5.1/
svn commit: r1625627 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Wed Sep 17 15:07:09 2014 New Revision: 1625627 URL: http://svn.apache.org/r1625627 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1625627&r1=1625626&r2=1625627&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Wed Sep 17 15:07:09 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1625627&r1=1625626&r2=1625627&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Wed Sep 17 15:07:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.1 + 2.5.2-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1625627&r1=1625626&r2=1625627&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Wed Sep 17 15:07:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.1 + 2.5.2-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1625627&r1=1625626&r2=1625627&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Wed Sep 17 15:07:09 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1 +2.5.2-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1625627&r1=1625626&r2=1625627&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Wed Sep 17 15:07:09 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.1 + 2.5.2-SNAPSHOT pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 - scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.5.1 - http://svn.apache.org/viewvc/maven/release/tags/maven-release-2.5.1 + scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk +http://svn.apache.org/viewvc/maven/release/trunk jira
svn commit: r1625625 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Wed Sep 17 15:07:03 2014 New Revision: 1625625 URL: http://svn.apache.org/r1625625 Log: [maven-release-plugin] prepare release maven-release-2.5.1 Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1625625&r1=1625624&r2=1625625&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Wed Sep 17 15:07:03 2014 @@ -1,55 +1,55 @@ - - - -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - 4.0.0 - -org.apache.maven.release -maven-release -2.5.1-SNAPSHOT - - - maven-release-api - - Maven Release APIs - - - - org.apache.maven - maven-repository-metadata - - - org.apache.maven - maven-artifact - - - org.eclipse.aether - aether-util - 1.0.0.v20140518 - - - - junit - junit - 4.8.1 - test - - + + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + +org.apache.maven.release +maven-release +2.5.1 + + + maven-release-api + + Maven Release APIs + + + + org.apache.maven + maven-repository-metadata + + + org.apache.maven + maven-artifact + + + org.eclipse.aether + aether-util + 1.0.0.v20140518 + + + + junit + junit + 4.8.1 + test + + \ No newline at end of file Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1625625&r1=1625624&r2=1625625&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Wed Sep 17 15:07:03 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.5.1-SNAPSHOT + 2.5.1 org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1625625&r1=1625624&r2=1625625&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Wed Sep 17 15:07:03 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.5.1-SNAPSHOT + 2.5.1 org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1625625&r1=1625624&r2=1625625&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Wed Sep 17 15:07:03 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.5.1-SNAPSHOT +2.5.1 ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1625625&r1=1625624&r2=1625625&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Wed Sep 17 15:07:03 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.5.1-SNAPSHOT + 2.5.1 pom Maven Release @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk -http://svn.apache.org/viewvc/maven/release/trunk + scm:svn:http://
svn commit: r1625626 - /maven/release/tags/maven-release-2.5.1/
Author: bimargulies Date: Wed Sep 17 15:07:06 2014 New Revision: 1625626 URL: http://svn.apache.org/r1625626 Log: [maven-release-plugin] copy for tag maven-release-2.5.1 Added: maven/release/tags/maven-release-2.5.1/ - copied from r1625625, maven/release/trunk/
svn commit: r6538 - in /release/maven/scm: maven-scm-1.9.2-source-release.zip.asc maven-scm-1.9.2-source-release.zip.asc.txt maven-scm-1.9.2-source-release.zip.md5 maven-scm-1.9.2-source-release.zip.m
Author: bimargulies Date: Wed Sep 17 14:53:40 2014 New Revision: 6538 Log: Fix file names for SCM 1.9.2. Added: release/maven/scm/maven-scm-1.9.2-source-release.zip.asc - copied unchanged from r6536, release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt release/maven/scm/maven-scm-1.9.2-source-release.zip.md5 - copied unchanged from r6536, release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt Removed: release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt
svn commit: r1625613 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ test/java/org/apache/maven/shared/release/phase/
Author: bimargulies Date: Wed Sep 17 14:36:54 2014 New Revision: 1625613 URL: http://svn.apache.org/r1625613 Log: MRELEASE-877: release:branch commit msg faulty Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1625613&r1=1625612&r2=1625613&view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java Wed Sep 17 14:36:54 2014 @@ -100,7 +100,7 @@ public class ScmBranchPhase String branchName = releaseDescriptor.getScmReleaseLabel(); ScmBranchParameters scmBranchParameters = new ScmBranchParameters(); -scmBranchParameters.setMessage( releaseDescriptor.getScmCommentPrefix() + " copy for branch " + branchName ); +scmBranchParameters.setMessage( releaseDescriptor.getScmCommentPrefix() + "copy for branch " + branchName ); scmBranchParameters.setRemoteBranching( releaseDescriptor.isRemoteTagging() ); scmBranchParameters.setScmRevision( releaseDescriptor.getScmReleasedPomRevision() ); Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1625613&r1=1625612&r2=1625613&view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java Wed Sep 17 14:36:54 2014 @@ -113,7 +113,7 @@ public class ScmTagPhase ScmFileSet fileSet = new ScmFileSet( new File( basedirAlignedReleaseDescriptor.getWorkingDirectory() ) ); String tagName = releaseDescriptor.getScmReleaseLabel(); ScmTagParameters scmTagParameters = -new ScmTagParameters( releaseDescriptor.getScmCommentPrefix() + " copy for tag " + tagName ); +new ScmTagParameters( releaseDescriptor.getScmCommentPrefix() + "copy for tag " + tagName ); scmTagParameters.setRemoteTagging( releaseDescriptor.isRemoteTagging() ); scmTagParameters.setScmRevision( releaseDescriptor.getScmReleasedPomRevision() ); if ( getLogger().isDebugEnabled() ) Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java?rev=1625613&r1=1625612&r2=1625613&view=diff == --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java Wed Sep 17 14:36:54 2014 @@ -89,7 +89,7 @@ public class ScmBranchPhaseTest MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects ); descriptor.setWorkingDirectory( getPath(rootProject.getFile().getParentFile() ) ); descriptor.setScmReleaseLabel( "release-label" ); -descriptor.setScmCommentPrefix( "[my prefix]" ); +descriptor.setScmCommentPrefix( "[my prefix] " ); ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile() ); @@ -127,7 +127,7 @@ public class ScmBranchPhaseTest MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects ); descriptor.setWorkingDirectory( getPath( rootProject.getFile().getParentFile() ) ); descriptor.setScmReleaseLabel( "release-label&quo
svn commit: r1625587 - in /maven/release/trunk: maven-release-api/pom.xml maven-release-manager/pom.xml maven-release-plugin/pom.xml maven-release-policies/maven-release-oddeven-policy/pom.xml pom.xml
Author: bimargulies Date: Wed Sep 17 13:48:44 2014 New Revision: 1625587 URL: http://svn.apache.org/r1625587 Log: MRELEASE-888: update to SCM 1.9.2. Modified: maven/release/trunk/maven-release-api/pom.xml maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-api/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/pom.xml?rev=1625587&r1=1625586&r2=1625587&view=diff == --- maven/release/trunk/maven-release-api/pom.xml (original) +++ maven/release/trunk/maven-release-api/pom.xml Wed Sep 17 13:48:44 2014 @@ -23,7 +23,7 @@ org.apache.maven.release maven-release -2.6.0-SNAPSHOT +2.5.1-SNAPSHOT maven-release-api Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1625587&r1=1625586&r2=1625587&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Wed Sep 17 13:48:44 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.6.0-SNAPSHOT +2.5.1-SNAPSHOT maven-release-manager @@ -35,7 +35,7 @@ org.apache.maven.release maven-release-api - 2.6.0-SNAPSHOT + 2.5.1-SNAPSHOT org.codehaus.plexus Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1625587&r1=1625586&r2=1625587&view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Wed Sep 17 13:48:44 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.6.0-SNAPSHOT +2.5.1-SNAPSHOT org.apache.maven.plugins @@ -66,7 +66,7 @@ org.apache.maven.release maven-release-manager - 2.6.0-SNAPSHOT + 2.5.1-SNAPSHOT org.apache.maven Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1625587&r1=1625586&r2=1625587&view=diff == --- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml (original) +++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml Wed Sep 17 13:48:44 2014 @@ -24,7 +24,7 @@ org.apache.maven.release maven-release -2.6.0-SNAPSHOT +2.5.1-SNAPSHOT ../.. Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1625587&r1=1625586&r2=1625587&view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Wed Sep 17 13:48:44 2014 @@ -30,7 +30,7 @@ org.apache.maven.release maven-release - 2.6.0-SNAPSHOT + 2.5.1-SNAPSHOT pom Maven Release @@ -70,7 +70,7 @@ -1.9.1 +1.9.2 2.2.1 maven-release-archives/maven-release-LATEST
svn commit: r6536 - /release/maven/scm/
Author: bimargulies Date: Wed Sep 17 11:49:16 2014 New Revision: 6536 Log: Release maven-scm 1.9.1. Added: release/maven/scm/maven-scm-1.9.2-source-release.zip (with props) release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt (with props) release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt (with props) Removed: release/maven/scm/maven-scm-1.9.1-source-release.zip release/maven/scm/maven-scm-1.9.1-source-release.zip.asc release/maven/scm/maven-scm-1.9.1-source-release.zip.md5 Added: release/maven/scm/maven-scm-1.9.2-source-release.zip == Binary file - no diff available. Propchange: release/maven/scm/maven-scm-1.9.2-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt == --- release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt (added) +++ release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt Wed Sep 17 11:49:16 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJUFCEVAAoJEJxPfp2YscxTAdsQAKxSfC0OXDqRD7U5FRuNWlk8 +jTB1hFboSwbHFKDe8QLk+9xq1a2RaU+nLvnEBfkiwO7zB1KkcWE6u3CJb0PSa6zu +3a4ZObh5Yu5lGSb+9G0gGpk5SXBZJkI4KuZgfOtBrdpiX2/zO35bP7v/w0ackH4p +QS1nlcaFtbWMRfNNrZ1qhsDqQuHXL8nW67y5Jp7o3wrjKMDuwzbH9YDPgn+TWyFO +T11+co7z9THU0UHskmJP/N0fnNpsyZ8L/JBjR406k3rJL88QPWjMzNRD63DFyt8V +DKDeYd9gHNtMLMLCCucHj+/0VtgO0CvOmMyBz3QWakKTXHYikbgs2OyfH0ntb9n/ +MTO8g9gSkAGCxufqWA+dki2BeeIYw6NDgU5LQ+zLo/VBm02NdHCVSWLjPttH54OT +GvAxFwgue4yLTYx0qBbst2LT0kXb+7/26u5LxYTjokXcwjcNDrMAPeu8nmNgNQ47 +zYoziPMbh7jOpmSyKHloaKaCf2D46n1CBuwDtZx4xa8uPtkN0OUlpwjj00iYTuyC +Gd3rnbQtugZKGUHsighunHTR1Nnzrej4XwUMUWjzRsgQQHRfx9ts+TtyYF3lDHso +SYEaOQDimHx58IurAVfMG3dyEtXP30pqc3gj/3CFmEXObqxMCFXQz0fpPQFZAkAO +4H0MMyrJToS6acZyk5i4 +=9h3I +-END PGP SIGNATURE- Propchange: release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt -- svn:eol-style = native Propchange: release/maven/scm/maven-scm-1.9.2-source-release.zip.asc.txt -- svn:mime-type = text/plain Added: release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt == --- release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt (added) +++ release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt Wed Sep 17 11:49:16 2014 @@ -0,0 +1 @@ +3fd4e1073c3ebb369fb42f1393ed2f0c \ No newline at end of file Propchange: release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt -- svn:eol-style = native Propchange: release/maven/scm/maven-scm-1.9.2-source-release.zip.md5.txt -- svn:mime-type = text/plain
svn commit: r1625524 - in /maven/site/trunk/content/apt: plugins/index.apt shared/index.apt
Author: bimargulies
Date: Wed Sep 17 11:40:46 2014
New Revision: 1625524
URL: http://svn.apache.org/r1625524
Log:
Note SCM release.
Modified:
maven/site/trunk/content/apt/plugins/index.apt
maven/site/trunk/content/apt/shared/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1625524&r1=1625523&r2=1625524&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Wed Sep 17 11:40:46 2014
@@ -160,7 +160,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-repository-plugin/} <<>>}} | B |
2.3.1| 2010-07-21 | Plugin to help with repository-based tasks. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-repository-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MREPOSITORY}JIRA}}
*--++--++--+++
-| {{{/scm/maven-scm-plugin/} <<>>}} | B |
1.9.1| 2014-07-20 | Execute SCM commands for the current project. |
{{{https://git-wip-us.apache.org/repos/asf/maven-scm.git }GIT}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
+| {{{/scm/maven-scm-plugin/} <<>>}} | B |
1.9.2| 2014-09-17 | Execute SCM commands for the current project. |
{{{https://git-wip-us.apache.org/repos/asf/maven-scm.git }GIT}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
*--++--++--+++
| {{{/plugins/maven-scm-publish-plugin/} <<>>}} | B |
1.1 | 2014-05-18 | Publish your Maven website to a scm location. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-scm-publish-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/MSCMPUB}JIRA}}
*--++--++--+++
Modified: maven/site/trunk/content/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1625524&r1=1625523&r2=1625524&view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Wed Sep 17 11:40:46 2014
@@ -57,6 +57,9 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-verifier/} <<>>}} |
1.5 | 2013-12-06| Used to run Maven builds as part of tests. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-verifier/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/13281}JIRA}}
*+--+---+--++-+
+| {{scm} <<>>}} |
1.9.2| 2014-09-17| Generic API to SCM systems. |
{{{git://git.apache.org/maven-scm.git}GIT}} |
{{{http://jira.codehaus.org/browse/SCM}JIRA}}
+*+--+---+--++-+
+
Archived version of shared libraries reference documentations are
{{{../shared-archives/}located here}}.
svn commit: r1624877 - /maven/site/trunk/content/apt/developers/conventions/git.apt
Author: bimargulies Date: Sun Sep 14 17:22:34 2014 New Revision: 1624877 URL: http://svn.apache.org/r1624877 Log: (no jira) repair goofs in APt. Modified: maven/site/trunk/content/apt/developers/conventions/git.apt Modified: maven/site/trunk/content/apt/developers/conventions/git.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/conventions/git.apt?rev=1624877&r1=1624876&r2=1624877&view=diff == --- maven/site/trunk/content/apt/developers/conventions/git.apt (original) +++ maven/site/trunk/content/apt/developers/conventions/git.apt Sun Sep 14 17:22:34 2014 @@ -40,7 +40,7 @@ Maven Git Convention ** For contributors who are not committers Apache git repositories are at - <>>. However, the ASF +< <>>. However, the ASF uses clones on github.com to make it easier for people to contribute changes via pull requests. @@ -66,6 +66,8 @@ Maven Git Convention Add a link to your pull request to the JIRA. Committers will take it from here. + [[]] + ** For committers Committers may, of course, commit directly to the ASF repositories. @@ -106,7 +108,7 @@ Submitted by: Baz Bazman o Applied without change +-+ -*** Apply User Patch +* Apply User Patch To keep the history of contributions clear, The committer should usually apply the patch without any <> @@ -175,7 +177,7 @@ $ git checkout . -*** power-git checkout +** power-git checkout This checkout is typical for highly experienced git users, and may serve as inspiration for others; as usual the best way to learn is by doing. Sample shown for maven-surefire
