svn commit: r1512219 - /maven/skins/trunk/maven-fluido-skin/
Author: dennisl Date: Fri Aug 9 09:33:44 2013 New Revision: 1512219 URL: http://svn.apache.org/r1512219 Log: Ignore IDEA-files. Modified: maven/skins/trunk/maven-fluido-skin/ (props changed) Propchange: maven/skins/trunk/maven-fluido-skin/ -- --- svn:ignore (original) +++ svn:ignore Fri Aug 9 09:33:44 2013 @@ -3,3 +3,4 @@ .settings target *.iml +.idea
svn commit: r1512234 - in /maven/shared/trunk/maven-mapping: ./ pom.xml
Author: dennisl
Date: Fri Aug 9 10:20:58 2013
New Revision: 1512234
URL: http://svn.apache.org/r1512234
Log:
Start a new shared component for mapping stuff.
The first addition will be the file name mapping code from Maven WAR Plugin.
Added:
maven/shared/trunk/maven-mapping/
maven/shared/trunk/maven-mapping/pom.xml (with props)
Added: maven/shared/trunk/maven-mapping/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1512234view=auto
==
--- maven/shared/trunk/maven-mapping/pom.xml (added)
+++ maven/shared/trunk/maven-mapping/pom.xml Fri Aug 9 10:20:58 2013
@@ -0,0 +1,110 @@
+?xml version='1.0' encoding='UTF-8'?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ License); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.maven.shared/groupId
+artifactIdmaven-shared-components/artifactId
+version19/version
+relativePath../maven-shared-components/pom.xml/relativePath
+ /parent
+
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-mapping/artifactId
+ version1.0-SNAPSHOT/version
+ packagingjar/packaging
+
+ nameApache Maven Mapping/name
+ descriptionA shared component to assist in interpolating file names using
properties from a Maven project./description
+
+ prerequisites
+maven${mavenVersion}/maven
+ /prerequisites
+
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping/developerConnection
+urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/url
+ /scm
+ issueManagement
+systemjira/system
+urlhttp://jira.codehaus.org/browse/MSHARED/component/16150/url
+ /issueManagement
+
+ properties
+mavenVersion2.0.6/mavenVersion
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-artifact/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-interpolation/artifactId
+ version1.15/version
+/dependency
+
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version4.11/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdorg.apache.maven.plugin-testing/groupId
+ artifactIdmaven-plugin-testing-harness/artifactId
+ version1.2/version
+ scopetest/scope
+/dependency
+ /dependencies
+
+ profiles
+profile
+ idreporting/id
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changes-plugin/artifactId
+version2.9/version
+configuration
+
columnNamesType,Key,Summary,Assignee,Status,Resolution,Created/columnNames
+ maxEntries200/maxEntries
+ onlyCurrentVersiontrue/onlyCurrentVersion
+ sortColumnNamesKey/sortColumnNames
+ versionPrefixmaven-mapping-/versionPrefix
+/configuration
+reportSets
+ reportSet
+reports
+ reportjira-report/report
+/reports
+ /reportSet
+/reportSets
+ /plugin
+/plugins
+ /reporting
+/profile
+ /profiles
+/project
Propchange: maven/shared/trunk/maven-mapping/pom.xml
--
svn:eol-style = native
Propchange: maven/shared/trunk/maven-mapping/pom.xml
--
svn:keywords = Date Revision Author Id
svn commit: r1512235 - in /maven/shared/trunk/maven-mapping/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/maven/ main/java/org/apache/maven/shared/ main/java/org/a
Author: dennisl Date: Fri Aug 9 10:23:07 2013 New Revision: 1512235 URL: http://svn.apache.org/r1512235 Log: Add the directory structure. Added: maven/shared/trunk/maven-mapping/src/ maven/shared/trunk/maven-mapping/src/main/ maven/shared/trunk/maven-mapping/src/main/java/ maven/shared/trunk/maven-mapping/src/main/java/org/ maven/shared/trunk/maven-mapping/src/main/java/org/apache/ maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/ maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/ maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/ maven/shared/trunk/maven-mapping/src/test/ maven/shared/trunk/maven-mapping/src/test/java/ maven/shared/trunk/maven-mapping/src/test/java/org/ maven/shared/trunk/maven-mapping/src/test/java/org/apache/ maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/ maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/ maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/
svn commit: r1512236 - /maven/shared/trunk/maven-mapping/
Author: dennisl Date: Fri Aug 9 10:24:38 2013 New Revision: 1512236 URL: http://svn.apache.org/r1512236 Log: Add standard ignores. Modified: maven/shared/trunk/maven-mapping/ (props changed) Propchange: maven/shared/trunk/maven-mapping/ -- --- svn:ignore (added) +++ svn:ignore Fri Aug 9 10:24:38 2013 @@ -0,0 +1,3 @@ +target +.idea +maven-mapping.iml
svn commit: r1512241 - in /maven/shared/trunk/maven-mapping/src: main/java/org/apache/maven/shared/mapping/ test/java/org/apache/maven/shared/mapping/
Author: dennisl
Date: Fri Aug 9 10:39:31 2013
New Revision: 1512241
URL: http://svn.apache.org/r1512241
Log:
Copy MappingUtils (with unit test) and DashClassifierValueSource from Maven WAR
Plugin.
Modify to fit the new package structure.
Remove unneeded throwing of MojoExecutionException in the unit test.
Added:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
- copied, changed from r1512220,
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Copied:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java?p2=maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.javap1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.javar1=1512220r2=1512241rev=1512241view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java?p2=maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.javap1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.javar1=1512220r2=1512241rev=1512241view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
(from r1512220,
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java?p2=maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.javap1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.javar1=1512220r2=1512241rev=1512241view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(original)
+++
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
Fri Aug 9 10:39:31 2013
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.shared.mapping;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -37,7 +36,7 @@ public class MappingUtilsTest
{
public void testCompleteMapping()
-throws MojoExecutionException
svn commit: r1512242 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Fri Aug 9 10:41:20 2013 New Revision: 1512242 URL: http://svn.apache.org/r1512242 Log: Add new maven-mapping component. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1512242r1=1512241r2=1512242view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Fri Aug 9 10:41:20 2013 @@ -53,6 +53,7 @@ under the License. modulemaven-downloader/module modulemaven-filtering/module modulemaven-invoker/module +modulemaven-mapping/module modulemaven-osgi/module modulemaven-project-utils/module modulemaven-reporting-api/module
svn propchange: r1512241 - svn:log
Author: dennisl Revision: 1512241 Modified property: svn:log Modified: svn:log at Fri Aug 9 10:43:52 2013 -- --- svn:log (original) +++ svn:log Fri Aug 9 10:43:52 2013 @@ -1,3 +1,5 @@ +[MSHARED-291] Copy code for file name mapping from Maven WAR Plugin + Copy MappingUtils (with unit test) and DashClassifierValueSource from Maven WAR Plugin. Modify to fit the new package structure. Remove unneeded throwing of MojoExecutionException in the unit test.
svn commit: r1512246 - /maven/shared/trunk/maven-mapping/pom.xml
Author: dennisl Date: Fri Aug 9 10:51:36 2013 New Revision: 1512246 URL: http://svn.apache.org/r1512246 Log: Use maven-javadoc-plugin:2.9.1 to avoid Javadoc vulnerability. Modified: maven/shared/trunk/maven-mapping/pom.xml Modified: maven/shared/trunk/maven-mapping/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/pom.xml?rev=1512246r1=1512245r2=1512246view=diff == --- maven/shared/trunk/maven-mapping/pom.xml (original) +++ maven/shared/trunk/maven-mapping/pom.xml Fri Aug 9 10:51:36 2013 @@ -79,6 +79,18 @@ /dependency /dependencies + build +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-javadoc-plugin/artifactId + version2.9.1/version +/plugin + /plugins +/pluginManagement + /build + profiles profile idreporting/id @@ -103,6 +115,11 @@ /reportSet /reportSets /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-javadoc-plugin/artifactId +version2.9.1/version + /plugin /plugins /reporting /profile
svn commit: r1512265 - in /maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping: DashClassifierValueSource.java MappingUtils.java
Author: dennisl
Date: Fri Aug 9 11:38:38 2013
New Revision: 1512265
URL: http://svn.apache.org/r1512265
Log:
Improve Javadoc.
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java?rev=1512265r1=1512264r2=1512265view=diff
==
---
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
Fri Aug 9 11:38:38 2013
@@ -29,7 +29,6 @@ import org.codehaus.plexus.interpolation
* codedashClassifier?/code.
*
* @version $Id$
- * @since 2.5
*/
public class DashClassifierValueSource
extends PropertiesBasedValueSource
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java?rev=1512265r1=1512264r2=1512265view=diff
==
---
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Fri Aug 9 11:38:38 2013
@@ -25,19 +25,26 @@ import org.codehaus.plexus.interpolation
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
/**
+ * p
* Utilities used to evaluate expression.
- * p/
- * TODO: this comes from the assembly plugin; refactor when it's shared.
- * p/
+ * /p
+ * p
* The expression might use any field of the {@link Artifact} interface. Some
* examples might be:
+ * /p
* ul
* li@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@/li
* li@{artifactId}@-@{version}@.@{extension}@/li
* li@{artifactId}@.@{extension}@/li
* /ul
+ * p
+ * Although parts of this code comes from the Assembly Plugin, it cannot be
+ * shared with the Assembly Plugin. The reason for this is that the Assembly
+ * Plugin always uses a prefix for the expressions, whereas this code does not.
+ * p/
*
* @author Stephane Nicoll
+ * @author Dennis Lundberg
* @version $Id$
*/
public class MappingUtils
svn commit: r1512271 - in /maven/shared/trunk/maven-mapping/src: main/java/org/apache/maven/shared/mapping/MappingUtils.java site/ site/apt/ site/apt/index.apt.vm site/site.xml
Author: dennisl
Date: Fri Aug 9 12:03:31 2013
New Revision: 1512271
URL: http://svn.apache.org/r1512271
Log:
Add documentation.
Added:
maven/shared/trunk/maven-mapping/src/site/
maven/shared/trunk/maven-mapping/src/site/apt/
maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm (with props)
maven/shared/trunk/maven-mapping/src/site/site.xml (with props)
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java?rev=1512271r1=1512270r2=1512271view=diff
==
---
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
(original)
+++
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
Fri Aug 9 12:03:31 2013
@@ -26,7 +26,7 @@ import org.codehaus.plexus.interpolation
/**
* p
- * Utilities used to evaluate expression.
+ * Utilities used to evaluate an expression.
* /p
* p
* The expression might use any field of the {@link Artifact} interface. Some
Added: maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm?rev=1512271view=auto
==
--- maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm (added)
+++ maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm Fri Aug 9
12:03:31 2013
@@ -0,0 +1,85 @@
+ --
+ Introduction
+ --
+ Dennis Lundberg
+ --
+ 2013-08-09
+ --
+
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ License); you may not use this file except in compliance
+ ~~ with the License. You may obtain a copy of the License at
+ ~~
+ ~~ http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied. See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+${project.name}
+
+ These classes originates from the file name mapping code in Maven WAR Plugin.
+
+ The goal is to provide a shared component for all plugins that need to do
+ mapping.
+
+
+* MappingUtils
+
+ This class ha a single method evaluateFileNameMapping that take an
+ expression and an Artifact as parameters. It returns a String
+ which is the result of interpolating the values from the Artifact
+ object into the expression.
+
+ Here is a bit of code from the WAR Plugin showing how you can use it:
+
++-
+protected String getFileName( Artifact artifact )
+{
+if ( getOutputFileNameMapping() != null )
+{
+// The user has specified a custom file name mapping expression
+return MappingUtils.evaluateFileNameMapping(
getOutputFileNameMapping(), artifact );
+}
+
+String classifier = artifact.getClassifier();
+if ( ( classifier != null ) !( .equals( classifier.trim() ) ) )
+{
+// The artifact has a classifier - use the default expression for
artifacts with classifier
+return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
+ artifact );
+}
+else
+{
+// The artifact does not have a classifier - use the default
expression for artifacts
+return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING, artifact );
+}
+}
++-
+
+
+* DashClassifierValueSource
+
+ This is an implementation of the ValueSource interface, and can be used
+ for interpolation. MappingUtils uses it internally. It adds these two
+ tokens to an Interpolator:
+
+ * dashClassifier
+
+ * dashClassifier?
+
+ []
+
+ You can invoke it like this:
+
++-
+Interpolator interpolator = StringSearchInterpolator());
+interpolator.addValueSource( new DashClassifierValueSource(
artifact.getClassifier() ) );
++-
Propchange: maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
--
svn:eol-style = native
Propchange: maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
svn commit: r1512277 - in /maven/plugins/trunk/maven-war-plugin: ./ src/main/java/org/apache/maven/plugin/war/packaging/ src/main/java/org/apache/maven/plugin/war/util/ src/test/java/org/apache/maven/
Author: dennisl Date: Fri Aug 9 12:15:14 2013 New Revision: 1512277 URL: http://svn.apache.org/r1512277 Log: [MWAR-302] Use the maven-mapping shared component Removed: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java Modified: maven/plugins/trunk/maven-war-plugin/pom.xml maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1512277r1=1512276r2=1512277view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Aug 9 12:15:14 2013 @@ -174,6 +174,12 @@ under the License. /dependency dependency + groupIdorg.apache.maven.shared/groupId + artifactIdmaven-mapping/artifactId + version1.0-SNAPSHOT/version +/dependency + +dependency groupIdjunit/groupId artifactIdjunit/artifactId version4.11/version Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1512277r1=1512276r2=1512277view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Fri Aug 9 12:15:14 2013 @@ -25,10 +25,10 @@ import java.io.IOException; import org.apache.commons.io.input.XmlStreamReader; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.war.util.MappingUtils; import org.apache.maven.plugin.war.util.PathSet; import org.apache.maven.plugin.war.util.WebappStructure; import org.apache.maven.shared.filtering.MavenFilteringException; +import org.apache.maven.shared.mapping.MappingUtils; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.jar.JarArchiver;
svn commit: r1512302 - /maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
Author: dennisl
Date: Fri Aug 9 13:41:45 2013
New Revision: 1512302
URL: http://svn.apache.org/r1512302
Log:
Add a link to Maven WAR Plugin.
Modified:
maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
Modified: maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm?rev=1512302r1=1512301r2=1512302view=diff
==
--- maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm (original)
+++ maven/shared/trunk/maven-mapping/src/site/apt/index.apt.vm Fri Aug 9
13:41:45 2013
@@ -64,6 +64,9 @@ ${project.name}
}
+-
+ Have a look at the
+
{{{http://maven.apache.org/plugins/maven-war-plugin/examples/file-name-mapping.html}documentation
for Maven WAR Plugin}}
+ for some examples of expressions that can be used.
* DashClassifierValueSource
svn commit: r1512450 - /maven/site/trunk/
Author: dennisl Date: Fri Aug 9 19:11:28 2013 New Revision: 1512450 URL: http://svn.apache.org/r1512450 Log: Add bugtraq properties. Modified: maven/site/trunk/ (props changed) Propchange: maven/site/trunk/ -- bugtraq:logregex = MNGSITE-\d+ Propchange: maven/site/trunk/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/site/trunk/ -- bugtraq:warnifnoissue = false
svn commit: r1512467 - /maven/trunks/
Author: dennisl Date: Fri Aug 9 19:45:24 2013 New Revision: 1512467 URL: http://svn.apache.org/r1512467 Log: Sort alphabetically. Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ -- --- svn:externals (original) +++ svn:externals Fri Aug 9 19:45:24 2013 @@ -1,19 +1,19 @@ +ant-tasks https://svn.apache.org/repos/asf/maven/ant-tasks/trunk archetype https://svn.apache.org/repos/asf/maven/archetype/trunk archetypes https://svn.apache.org/repos/asf/maven/archetypes/trunk -indexer https://svn.apache.org/repos/asf/maven/indexer/trunk -plugins https://svn.apache.org/repos/asf/maven/plugins/trunk -site https://svn.apache.org/repos/asf/maven/site/trunk -shared https://svn.apache.org/repos/asf/maven/shared/trunk -skins https://svn.apache.org/repos/asf/maven/skins/trunk doxia https://svn.apache.org/repos/asf/maven/doxia/trunks +enforcer https://svn.apache.org/repos/asf/maven/enforcer/trunk +indexer https://svn.apache.org/repos/asf/maven/indexer/trunk jxrhttps://svn.apache.org/repos/asf/maven/jxr/trunk +plugin-testing https://svn.apache.org/repos/asf/maven/plugin-testing/trunk +plugin-tools https://svn.apache.org/repos/asf/maven/plugin-tools/trunk +plugins https://svn.apache.org/repos/asf/maven/plugins/trunk pomhttps://svn.apache.org/repos/asf/maven/pom/trunk -resources https://svn.apache.org/repos/asf/maven/resources/trunk -release https://svn.apache.org/repos/asf/maven/release/trunk -ant-tasks https://svn.apache.org/repos/asf/maven/ant-tasks/trunk -sandbox https://svn.apache.org/repos/asf/maven/sandbox/trunk project https://svn.apache.org/repos/asf/maven/project -enforcer https://svn.apache.org/repos/asf/maven/enforcer/trunk -plugin-tools https://svn.apache.org/repos/asf/maven/plugin-tools/trunk -plugin-testing https://svn.apache.org/repos/asf/maven/plugin-testing/trunk +release https://svn.apache.org/repos/asf/maven/release/trunk repository-tools https://svn.apache.org/repos/asf/maven/repository-tools/trunk +resources https://svn.apache.org/repos/asf/maven/resources/trunk +sandbox https://svn.apache.org/repos/asf/maven/sandbox/trunk +shared https://svn.apache.org/repos/asf/maven/shared/trunk +site https://svn.apache.org/repos/asf/maven/site/trunk +skins https://svn.apache.org/repos/asf/maven/skins/trunk
git commit: Ignore IDEA files and target directories.
Updated Branches: refs/heads/maven-2.2.x 12436435d - 76aaea36b Ignore IDEA files and target directories. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/76aaea36 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/76aaea36 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/76aaea36 Branch: refs/heads/maven-2.2.x Commit: 76aaea36bcc935983cdc5e7d7254d46a9aa5af9d Parents: 1243643 Author: Dennis Lundberg denn...@apache.org Authored: Sat Aug 10 00:30:09 2013 +0200 Committer: Dennis Lundberg denn...@apache.org Committed: Sat Aug 10 00:30:09 2013 +0200 -- .gitignore | 3 +++ apache-maven/.gitignore | 2 ++ maven-artifact-manager/.gitignore| 2 ++ maven-artifact-test/.gitignore | 2 ++ maven-artifact/.gitignore| 2 ++ maven-compat/.gitignore | 2 ++ maven-core/.gitignore| 2 ++ maven-error-diagnostics/.gitignore | 2 ++ maven-model/.gitignore | 2 ++ maven-monitor/.gitignore | 2 ++ maven-plugin-api/.gitignore | 2 ++ maven-plugin-descriptor/.gitignore | 2 ++ maven-plugin-parameter-documenter/.gitignore | 2 ++ maven-plugin-registry/.gitignore | 2 ++ maven-profile/.gitignore | 2 ++ maven-project/.gitignore | 2 ++ maven-repository-metadata/.gitignore | 2 ++ maven-settings/.gitignore| 2 ++ maven-toolchain/.gitignore | 2 ++ 19 files changed, 39 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/.gitignore -- diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..25cfc14 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.idea/ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/apache-maven/.gitignore -- diff --git a/apache-maven/.gitignore b/apache-maven/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/apache-maven/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-artifact-manager/.gitignore -- diff --git a/maven-artifact-manager/.gitignore b/maven-artifact-manager/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-artifact-manager/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-artifact-test/.gitignore -- diff --git a/maven-artifact-test/.gitignore b/maven-artifact-test/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-artifact-test/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-artifact/.gitignore -- diff --git a/maven-artifact/.gitignore b/maven-artifact/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-artifact/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-compat/.gitignore -- diff --git a/maven-compat/.gitignore b/maven-compat/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-compat/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-core/.gitignore -- diff --git a/maven-core/.gitignore b/maven-core/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-core/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-error-diagnostics/.gitignore -- diff --git a/maven-error-diagnostics/.gitignore b/maven-error-diagnostics/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-error-diagnostics/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml http://git-wip-us.apache.org/repos/asf/maven/blob/76aaea36/maven-model/.gitignore -- diff --git a/maven-model/.gitignore b/maven-model/.gitignore new file mode 100644 index 000..17bb010 --- /dev/null +++ b/maven-model/.gitignore @@ -0,0 +1,2 @@ +/target/ +/*.iml
svn commit: r1511474 - in /maven/resources/trunk: apache-source-release-assembly-descriptor/RELEASE_NOTES.txt src/site/xdoc/index.xml.vm
Author: dennisl Date: Wed Aug 7 20:29:28 2013 New Revision: 1511474 URL: http://svn.apache.org/r1511474 Log: Set eol-style to native. Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/RELEASE_NOTES.txt (props changed) maven/resources/trunk/src/site/xdoc/index.xml.vm (props changed) Propchange: maven/resources/trunk/apache-source-release-assembly-descriptor/RELEASE_NOTES.txt -- svn:eol-style = native Propchange: maven/resources/trunk/src/site/xdoc/index.xml.vm -- svn:eol-style = native
svn commit: r1511484 - /maven/resources/trunk/src/site/site.xml
Author: dennisl
Date: Wed Aug 7 21:01:42 2013
New Revision: 1511484
URL: http://svn.apache.org/r1511484
Log:
Do not show the version, since it will always be 1-SNAPSHOT.
Modified:
maven/resources/trunk/src/site/site.xml
Modified: maven/resources/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/src/site/site.xml?rev=1511484r1=1511483r2=1511484view=diff
==
--- maven/resources/trunk/src/site/site.xml (original)
+++ maven/resources/trunk/src/site/site.xml Wed Aug 7 21:01:42 2013
@@ -24,6 +24,7 @@
xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd;
name=Apache Maven Resource Bundles
+ version position=none/
bannerLeft
name${project.name}/name
svn commit: r1511486 - /maven/resources/trunk/src/site/xdoc/index.xml.vm
Author: dennisl Date: Wed Aug 7 21:02:17 2013 New Revision: 1511486 URL: http://svn.apache.org/r1511486 Log: Tweak the documentation. Modified: maven/resources/trunk/src/site/xdoc/index.xml.vm Modified: maven/resources/trunk/src/site/xdoc/index.xml.vm URL: http://svn.apache.org/viewvc/maven/resources/trunk/src/site/xdoc/index.xml.vm?rev=1511486r1=1511485r2=1511486view=diff == --- maven/resources/trunk/src/site/xdoc/index.xml.vm (original) +++ maven/resources/trunk/src/site/xdoc/index.xml.vm Wed Aug 7 21:02:17 2013 @@ -20,26 +20,27 @@ -- document properties -titleApache Maven Resource Bundles/title +titleIntroduction/title authorOlivier Lamy/author /properties body section name=Apache Maven Resource Bundles - pThis project a set of resources to help you building Java resources compliant with Apache rules./p + pThis project is a set of resources to help you building Java resources compliant with Apache rules./p - section name=Text Materials + section name=JAR Resource Bundle and Incubator Disclaimer Resource Bundle p To generate in your jar: ul licodeMETA-INF/DEPENDENCIES/code/li licodeMETA-INF/LICENSE/code/li licodeMETA-INF/NOTICE/code/li +licodeMETA-INF/DISCLAIMER/code/li /ul source![CDATA[ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-remote-resources-plugin/artifactId -version1.3/version +version1.4/version executions execution goals @@ -61,7 +62,7 @@ /p /section - section name=Source Assembly Descriptor + section name=Source Release Assembly Descriptor pCreate a source-release artifact that contains the fully buildable project directory source structure. This is the artifact which is the official subject of any release vote. source![CDATA[ plugin
svn commit: r1511487 - /maven/resources/trunk/pom.xml
Author: dennisl Date: Wed Aug 7 21:04:15 2013 New Revision: 1511487 URL: http://svn.apache.org/r1511487 Log: [MASFRES-2] apache jar resource bundle does not appear to be documented - Add JIRA location Modified: maven/resources/trunk/pom.xml Modified: maven/resources/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/resources/trunk/pom.xml?rev=1511487r1=1511486r2=1511487view=diff == --- maven/resources/trunk/pom.xml (original) +++ maven/resources/trunk/pom.xml Wed Aug 7 21:04:15 2013 @@ -36,6 +36,11 @@ nameApache Maven Resource Bundles/name inceptionYear2012/inceptionYear + issueManagement +systemjira/system +urlhttps://issues.apache.org/jira/browse/MASFRES/url + /issueManagement + properties apache-jar-resource-bundle-version1.5-SNAPSHOT/apache-jar-resource-bundle-version apache-jar-txt-resource-bundle-version1.5-SNAPSHOT/apache-jar-txt-resource-bundle-version
svn commit: r1511489 - /maven/resources/trunk/
Author: dennisl Date: Wed Aug 7 21:06:02 2013 New Revision: 1511489 URL: http://svn.apache.org/r1511489 Log: Add bugtraq properties. Modified: maven/resources/trunk/ (props changed) Propchange: maven/resources/trunk/ -- bugtraq:logregex = MASFRES-\d+ Propchange: maven/resources/trunk/ -- bugtraq:url = https://issues.apache.org/jira/browse/%BUGID% Propchange: maven/resources/trunk/ -- bugtraq:warnifnoissue = false
svn propchange: r1505380 - svn:log
Author: dennisl Revision: 1505380 Modified property: svn:log Modified: svn:log at Wed Aug 7 21:06:42 2013 -- --- svn:log (original) +++ svn:log Wed Aug 7 21:06:42 2013 @@ -1 +1 @@ -Remove spurious blank lines in generated NOTICE file. +[MASFRES-1] Remove spurious blank lines in generated NOTICE file.
svn commit: r1511076 - /maven/site/trunk/content/markdown/project-roles.md
Author: dennisl Date: Tue Aug 6 19:14:07 2013 New Revision: 1511076 URL: http://svn.apache.org/r1511076 Log: Fix spelling and some syntax problems. Modified: maven/site/trunk/content/markdown/project-roles.md Modified: maven/site/trunk/content/markdown/project-roles.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/project-roles.md?rev=1511076r1=1511075r2=1511076view=diff == --- maven/site/trunk/content/markdown/project-roles.md (original) +++ maven/site/trunk/content/markdown/project-roles.md Tue Aug 6 19:14:07 2013 @@ -19,7 +19,7 @@ under the License. # Apache Maven Project Roles The Apache Maven project is not just the software it produces. -The Apache Foundation has a phrase: âCommunity over codeâ which +The Apache Foundation has a phrase: Community over code which is about how it is the community that grows around a project that is the most important thing. @@ -89,6 +89,7 @@ community. ### Users People who use Maven and have joined the community. This includes people who have: + * Submitted a bug report, * Asked a question on the [Maven user list][2], * Joined one of the other Maven user communities. @@ -112,6 +113,7 @@ Maven user community and subscribe to th People who use Maven, have joined the Maven community and contribute back to the community. This includes people who: + * Submit reports of the results of testing proposed releases of Maven and Maven plugins, * Answer questions on the [Maven user list][2] (or even other Maven user communities), @@ -235,7 +237,7 @@ technology choices. Forks of the project codebase -All code that gets released by the community should have sufficient opertunity +All code that gets released by the community should have sufficient opportunity for review both: * By the PMC, to check the legal responsibilities delegated by
svn commit: r1511098 - in /maven: sandbox/trunk/shared/maven-ant/ shared/trunk/maven-ant/
Author: dennisl Date: Tue Aug 6 19:49:13 2013 New Revision: 1511098 URL: http://svn.apache.org/r1511098 Log: Move maven-ant to the sandbox. Added: maven/sandbox/trunk/shared/maven-ant/ - copied from r1511097, maven/shared/trunk/maven-ant/ Removed: maven/shared/trunk/maven-ant/
svn commit: r1511099 - in /maven: sandbox/trunk/shared/maven-plugin-enforcer/ shared/trunk/maven-plugin-enforcer/
Author: dennisl Date: Tue Aug 6 19:50:20 2013 New Revision: 1511099 URL: http://svn.apache.org/r1511099 Log: Move maven-plugin-enforcer to the sandbox. Added: maven/sandbox/trunk/shared/maven-plugin-enforcer/ - copied from r1511098, maven/shared/trunk/maven-plugin-enforcer/ Removed: maven/shared/trunk/maven-plugin-enforcer/
svn commit: r1511101 - in /maven: sandbox/trunk/shared/maven-script/ shared/trunk/maven-script/
Author: dennisl Date: Tue Aug 6 19:52:02 2013 New Revision: 1511101 URL: http://svn.apache.org/r1511101 Log: Move maven-script to the sandbox. Added: maven/sandbox/trunk/shared/maven-script/ - copied from r1511100, maven/shared/trunk/maven-script/ Removed: maven/shared/trunk/maven-script/
svn commit: r1511102 - in /maven: sandbox/trunk/shared/maven-shared-monitor/ shared/trunk/maven-shared-monitor/
Author: dennisl Date: Tue Aug 6 19:53:01 2013 New Revision: 1511102 URL: http://svn.apache.org/r1511102 Log: Move maven-shared-monitor to the sandbox. Added: maven/sandbox/trunk/shared/maven-shared-monitor/ - copied from r1511101, maven/shared/trunk/maven-shared-monitor/ Removed: maven/shared/trunk/maven-shared-monitor/
svn commit: r1511104 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Tue Aug 6 19:54:43 2013 New Revision: 1511104 URL: http://svn.apache.org/r1511104 Log: maven-ant, maven-plugin-enforcer, maven-script and maven-shared-monitor have been moved to the sandbox. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1511104r1=1511103r2=1511104view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Aug 6 19:54:43 2013 @@ -46,7 +46,6 @@ under the License. modulemaven-shared-utils/module modulemaven-shared-incremental/module modulefile-management/module -modulemaven-ant/module modulemaven-archiver/module modulemaven-common-artifact-filters/module modulemaven-dependency-analyzer/module @@ -55,16 +54,13 @@ under the License. modulemaven-filtering/module modulemaven-invoker/module modulemaven-osgi/module -modulemaven-plugin-enforcer/module modulemaven-project-utils/module modulemaven-reporting-api/module modulemaven-reporting-impl/module modulemaven-repository-builder/module modulemaven-runtime/module -modulemaven-script/module modulemaven-shared-io/module modulemaven-shared-jar/module -modulemaven-shared-monitor/module modulemaven-shared-resources/module modulemaven-verifier/module modulemaven-jarsigner/module
svn commit: r1511108 - in /maven/sandbox/trunk/shared: maven-ant/pom.xml maven-plugin-enforcer/pom.xml maven-script/pom.xml maven-shared-monitor/pom.xml
Author: dennisl Date: Tue Aug 6 20:02:25 2013 New Revision: 1511108 URL: http://svn.apache.org/r1511108 Log: Comment out scm section to prevent accidental release from sandbox. Modified: maven/sandbox/trunk/shared/maven-ant/pom.xml maven/sandbox/trunk/shared/maven-plugin-enforcer/pom.xml maven/sandbox/trunk/shared/maven-script/pom.xml maven/sandbox/trunk/shared/maven-shared-monitor/pom.xml Modified: maven/sandbox/trunk/shared/maven-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-ant/pom.xml?rev=1511108r1=1511107r2=1511108view=diff == --- maven/sandbox/trunk/shared/maven-ant/pom.xml (original) +++ maven/sandbox/trunk/shared/maven-ant/pom.xml Tue Aug 6 20:02:25 2013 @@ -45,12 +45,13 @@ under the License. emailjvan...@apache.org/email /developer /developers - +!-- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-ant/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-ant/developerConnection urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-ant/url /scm +-- issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/MSHARED/component/14295/url Modified: maven/sandbox/trunk/shared/maven-plugin-enforcer/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-plugin-enforcer/pom.xml?rev=1511108r1=1511107r2=1511108view=diff == --- maven/sandbox/trunk/shared/maven-plugin-enforcer/pom.xml (original) +++ maven/sandbox/trunk/shared/maven-plugin-enforcer/pom.xml Tue Aug 6 20:02:25 2013 @@ -39,14 +39,14 @@ test new plugin versions without actually changing the POMs. /description inceptionYear2009/inceptionYear - +!-- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven/maven-plugin-enforcer/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven/maven-plugin-enforcer /developerConnection urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven/maven-plugin-enforcer/url /scm - +-- properties project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding project.build.outputEncodingUTF-8/project.build.outputEncoding Modified: maven/sandbox/trunk/shared/maven-script/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-script/pom.xml?rev=1511108r1=1511107r2=1511108view=diff == --- maven/sandbox/trunk/shared/maven-script/pom.xml (original) +++ maven/sandbox/trunk/shared/maven-script/pom.xml Tue Aug 6 20:02:25 2013 @@ -40,12 +40,13 @@ under the License. modulemaven-script-ant/module modulemaven-script-beanshell/module /modules - +!-- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-script/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-script/developerConnection urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-script/url /scm +-- issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/MSHARED/component/13277/url Modified: maven/sandbox/trunk/shared/maven-shared-monitor/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-monitor/pom.xml?rev=1511108r1=1511107r2=1511108view=diff == --- maven/sandbox/trunk/shared/maven-shared-monitor/pom.xml (original) +++ maven/sandbox/trunk/shared/maven-shared-monitor/pom.xml Tue Aug 6 20:02:25 2013 @@ -32,12 +32,13 @@ nameApache Maven Shared Monitor API/name descriptionBasic API for lightweight logging/description - +!-- scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-monitor/connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-monitor/developerConnection urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-monitor/url /scm +-- issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/MSHARED/component/13280/url
svn commit: r1509014 - in /maven/plugins/trunk/maven-changelog-plugin/src/it: minimal-pom-output-encoding/ minimal-pom/ project-reporting-output-encoding/ with-svnjava-maven-2.x/ with-svnjava-maven-3/
Author: dennisl Date: Wed Jul 31 20:15:44 2013 New Revision: 1509014 URL: http://svn.apache.org/r1509014 Log: Add missing license headers. Modified: maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh maven/plugins/trunk/maven-changelog-plugin/src/it/project-reporting-output-encoding/verify.bsh maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/invoker.properties maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/invoker.properties Modified: maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh?rev=1509014r1=1509013r2=1509014view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom-output-encoding/verify.bsh Wed Jul 31 20:15:44 2013 @@ -1,3 +1,23 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.*; import java.util.*; import java.util.regex.*; Modified: maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh?rev=1509014r1=1509013r2=1509014view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/it/minimal-pom/verify.bsh Wed Jul 31 20:15:44 2013 @@ -1,3 +1,23 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.*; import java.util.*; import java.util.regex.*; Modified: maven/plugins/trunk/maven-changelog-plugin/src/it/project-reporting-output-encoding/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/project-reporting-output-encoding/verify.bsh?rev=1509014r1=1509013r2=1509014view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/it/project-reporting-output-encoding/verify.bsh (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/it/project-reporting-output-encoding/verify.bsh Wed Jul 31 20:15:44 2013 @@ -1,3 +1,23 @@ + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.*; import java.util.*; import
svn commit: r1509021 - in /maven/plugins/trunk/maven-changes-plugin/src/it: announce-generate/goals.txt announce-generate/invoker.properties announcement-generate-custom-template/goals.txt announcemen
Author: dennisl Date: Wed Jul 31 20:47:28 2013 New Revision: 1509021 URL: http://svn.apache.org/r1509021 Log: Convert from using goals.txt to using invoker.properties when running ITs. Added: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties (with props) maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties (with props) Removed: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/goals.txt maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/goals.txt Added: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties?rev=1509021view=auto == --- maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties (added) +++ maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties Wed Jul 31 20:47:28 2013 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = clean changes:announcement-generate \ No newline at end of file Propchange: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/invoker.properties -- svn:eol-style = native Added: maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties?rev=1509021view=auto == --- maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties (added) +++ maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties Wed Jul 31 20:47:28 2013 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = changes:changes-validate changes:announcement-generate \ No newline at end of file Propchange: maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/invoker.properties -- svn:eol-style = native
svn commit: r1509023 - in /maven/plugins/trunk/maven-changes-plugin: pom.xml src/it/announcement-generate-custom-template/template-directory/test-announce.vm
Author: dennisl
Date: Wed Jul 31 20:48:19 2013
New Revision: 1509023
URL: http://svn.apache.org/r1509023
Log:
Add missing license headers where possible.
Configure explicit RAT exclusions for the files that cannot contain a license
header.
This plugin now passes the checks done by RAT.
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/template-directory/test-announce.vm
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1509023r1=1509022r2=1509023view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Wed Jul 31 20:48:19 2013
@@ -393,6 +393,20 @@ under the License.
skipErrorNoDescriptorsFoundtrue/skipErrorNoDescriptorsFound
/configuration
/plugin
+plugin
+ groupIdorg.apache.rat/groupId
+ artifactIdapache-rat-plugin/artifactId
+ version0.9/version
+ configuration
+excludes
+ !--
+This file should not contain a license header as it represents
+real data downloaded from a JIRA server.
+ --
+
excludesrc/test/resources/org/apache/maven/plugin/jira/unicode-jira-results.xml/exclude
+/excludes
+ /configuration
+/plugin
/plugins
/pluginManagement
plugins
Modified:
maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/template-directory/test-announce.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/template-directory/test-announce.vm?rev=1509023r1=1509022r2=1509023view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/template-directory/test-announce.vm
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/it/announcement-generate-custom-template/template-directory/test-announce.vm
Wed Jul 31 20:48:19 2013
@@ -1,5 +1,20 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## License); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
The ${developmentTeam} is pleased to announce the ${finalName} release!
${introduction}
-$date.systemDate
\ No newline at end of file
svn commit: r1509028 - in /maven/plugins/trunk/maven-antrun-plugin/src/it: filesets-test/goals.txt filesets-test/invoker.properties multiple-phase-test/goals.txt multiple-phase-test/invoker.properties
Author: dennisl Date: Wed Jul 31 20:59:29 2013 New Revision: 1509028 URL: http://svn.apache.org/r1509028 Log: Convert from using goals.txt to using invoker.properties when running ITs. Added: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties (with props) Removed: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/goals.txt maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/goals.txt Added: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties?rev=1509028view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties Wed Jul 31 20:59:29 2013 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = clean generate-resources Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/invoker.properties -- svn:keywords = Date Revision Author Id Added: maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties?rev=1509028view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties Wed Jul 31 20:59:29 2013 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = generate-resources Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/invoker.properties -- svn:keywords = Date Revision Author Id
svn commit: r1509032 - in /maven/plugins/trunk/maven-antrun-plugin/src/it: ant-1.7-features/ antrun-default-test/ attach-artifact-test/ copy-fail-test/ local-repo-prop-test/ never-fail-test/ propertie
Author: dennisl
Date: Wed Jul 31 21:05:53 2013
New Revision: 1509032
URL: http://svn.apache.org/r1509032
Log:
Add missing license headers.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/verify.bsh
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/verify.bsh
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/invoker.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/test.properties
maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/verify.bsh
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh?rev=1509032r1=1509031r2=1509032view=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
(original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
Wed Jul 31 21:05:53 2013
@@ -1,3 +1,23 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.*;
import org.codehaus.plexus.util.*;
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/invoker.properties?rev=1509032r1=1509031r2=1509032view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/invoker.properties
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/invoker.properties
Wed Jul 31 21:05:53 2013
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# License); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:run
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/verify.bsh?rev=1509032r1=1509031r2=1509032view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/verify.bsh
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/verify.bsh
Wed Jul 31 21:05:53 2013
@@ -1,3 +1,23 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE
svn commit: r1509036 - in /maven/plugins/trunk/maven-antrun-plugin/src/it: classpath-ref-test/ classpath-test-scope-test/ custom-task-test/ env-var-test/ filesets-test/ multiple-phase-test/ plugin-cla
Author: dennisl Date: Wed Jul 31 21:12:11 2013 New Revision: 1509036 URL: http://svn.apache.org/r1509036 Log: Add missing license headers. Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/verify.bsh maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/verify.bsh maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml?rev=1509036r1=1509035r2=1509036view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml Wed Jul 31 21:12:11 2013 @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml?rev=1509036r1=1509035r2=1509036view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml Wed Jul 31 21:12:11 2013 @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml?rev=1509036r1=1509035r2=1509036view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml Wed Jul 31 21:12:11 2013 @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may
svn commit: r1509044 - in /maven/plugins/trunk/maven-antrun-plugin/src/it: classpath-ref-test/ classpath-ref-test/src/main/java/ copy-fail-test/stuff/ custom-task-test/ custom-task-test/src/main/java/
Author: dennisl
Date: Wed Jul 31 21:47:27 2013
New Revision: 1509044
URL: http://svn.apache.org/r1509044
Log:
Add missing license headers.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test1.txt
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test2.txt
maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java
maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java
maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/calc.g
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml?rev=1509044r1=1509043r2=1509044view=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
(original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
Wed Jul 31 21:47:27 2013
@@ -1,4 +1,24 @@
?xml version=1.0?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
project name=test1
target name=test
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java?rev=1509044r1=1509043r2=1509044view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
Wed Jul 31 21:47:27 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
public class Test {
public static void main(String args[]) {
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test1.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test1.txt?rev=1509044r1=1509043r2=1509044view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test1.txt
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/stuff/test1.txt
Wed Jul 31 21:47:27 2013
@@ -1 +1,18 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except
svn commit: r1508434 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/ main/java/org/apache/maven/plugin/war/packaging/ main/java/org/apache/maven/plugin/war/util/
Author: dennisl
Date: Tue Jul 30 13:33:50 2013
New Revision: 1508434
URL: http://svn.apache.org/r1508434
Log:
Move the mapping constants to the MappingUtils class.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1508434r1=1508433r2=1508434view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Tue Jul 30 13:33:50 2013
@@ -65,11 +65,6 @@ import org.codehaus.plexus.util.StringUt
public abstract class AbstractWarMojo
extends AbstractMojo
{
-public static final String DEFAULT_FILE_NAME_MAPPING =
@{artifactId}@-@{baseVersion}@.@{extension}@;
-
-public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
-@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@;
-
private static final String[] EMPTY_STRING_ARRAY = {};
private static final String META_INF = META-INF;
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1508434r1=1508433r2=1508434view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
Tue Jul 30 13:33:50 2013
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.AbstractWarMojo;
import org.apache.maven.plugin.war.util.MappingUtils;
import org.apache.maven.plugin.war.util.PathSet;
import org.apache.maven.plugin.war.util.WebappStructure;
@@ -437,12 +436,12 @@ public abstract class AbstractWarPackagi
String classifier = artifact.getClassifier();
if ( ( classifier != null ) !( .equals( classifier.trim() ) ) )
{
-return MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
+return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
artifact );
}
else
{
-return MappingUtils.evaluateFileNameMapping(
AbstractWarMojo.DEFAULT_FILE_NAME_MAPPING, artifact );
+return MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING, artifact );
}
}
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=1508434r1=1508433r2=1508434view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Tue Jul 30 13:33:50 2013
@@ -48,6 +48,9 @@ import org.codehaus.plexus.interpolation
*/
public class MappingUtils
{
+public static final String DEFAULT_FILE_NAME_MAPPING =
@{artifactId}@-@{baseVersion}@.@{extension}@;
+public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
+@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@;
/**
* Evaluates the specified expression for the given artifact.
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=1508434r1=1508433r2=1508434view=diff
svn commit: r1508437 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util: DashClassifierValueSource.java MappingUtils.java
Author: dennisl
Date: Tue Jul 30 13:47:45 2013
New Revision: 1508437
URL: http://svn.apache.org/r1508437
Log:
Refactoring: extract class.
Added:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
(with props)
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Added:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java?rev=1508437view=auto
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
(added)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
Tue Jul 30 13:47:45 2013
@@ -0,0 +1,64 @@
+package org.apache.maven.plugin.war.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Properties;
+
+import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
+
+/**
+ * This is a ValueSource, that can be used in an Interpolator. It supports
+ * special expressions, like codedashClassifier/code and
+ * codedashClassifier?/code.
+ *
+ * @version $Id$
+ * @since 2.5
+ */
+public class DashClassifierValueSource
+extends PropertiesBasedValueSource
+{
+/**
+ * Create the ValueSource.
+ *
+ * @param classifier The classifier that should be used during
interpolation
+ */
+public DashClassifierValueSource( String classifier )
+{
+super( createDashClassifierProperties( classifier ) );
+}
+
+private static Properties createDashClassifierProperties( String
classifier )
+{
+Properties classifierMask = new Properties();
+classifierMask.setProperty( classifier, );
+
+if ( classifier != null )
+{
+classifierMask.setProperty( dashClassifier?, - + classifier );
+classifierMask.setProperty( dashClassifier, - + classifier );
+}
+else
+{
+classifierMask.setProperty( dashClassifier?, );
+classifierMask.setProperty( dashClassifier, );
+}
+return classifierMask;
+}
+}
Propchange:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
--
svn:keywords = Date Revision Author Id
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=1508437r1=1508436r2=1508437view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Tue Jul 30 13:47:45 2013
@@ -65,36 +65,21 @@ public class MappingUtils
String value = expression;
// FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the
object.
+// [dennisl; 2013-07-30] This was fixed in Maven 2.0.8
artifact.isSnapshot();
RegexBasedInterpolator interpolator = new RegexBasedInterpolator(
\\@\\{(, )?([^}]+)\\}@ );
interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
interpolator.addValueSource( new ObjectBasedValueSource(
artifact.getArtifactHandler() ) );
-Properties classifierMask = new Properties();
-classifierMask.setProperty( classifier
svn commit: r1508454 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java test/java/org/apache/maven/plugin/war/util/MappingUtilsTe
Author: dennisl
Date: Tue Jul 30 14:11:50 2013
New Revision: 1508454
URL: http://svn.apache.org/r1508454
Log:
Document the purpose of the classifier property, and move it to the correct
place.
Test when classifier is null, but it is still used in the mapping.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java?rev=1508454r1=1508453r2=1508454view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DashClassifierValueSource.java
Tue Jul 30 14:11:50 2013
@@ -47,7 +47,6 @@ public class DashClassifierValueSource
private static Properties createDashClassifierProperties( String
classifier )
{
Properties classifierMask = new Properties();
-classifierMask.setProperty( classifier, );
if ( classifier != null )
{
@@ -58,6 +57,8 @@ public class DashClassifierValueSource
{
classifierMask.setProperty( dashClassifier?, );
classifierMask.setProperty( dashClassifier, );
+// Make sure that the classifier property is usable, if it is null
+classifierMask.setProperty( classifier, );
}
return classifierMask;
}
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=1508454r1=1508453r2=1508454view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Tue Jul 30 14:11:50 2013
@@ -81,6 +81,18 @@ public class MappingUtilsTest
MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
}
+public void testMappingWithNullClassifier()
+throws MojoExecutionException, InterpolationException
+{
+TestArtifactStub jar = new TestArtifactStub();
+jar.setGroupId( org.apache.sample );
+jar.setArtifactId( maven-test-lib );
+jar.setVersion( 1.0 );
+jar.setClassifier( null );
+assertEquals( maven-test-lib-1.0-.jar,
+ MappingUtils.evaluateFileNameMapping(
MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+}
+
/**
* Test for MWAR-212.
*/
svn commit: r1508456 - /maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Author: dennisl
Date: Tue Jul 30 14:14:57 2013
New Revision: 1508456
URL: http://svn.apache.org/r1508456
Log:
Make TestArtifactStub independent of AbstractArtifactStub.
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?rev=1508456r1=1508455r2=1508456view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Tue Jul 30 14:14:57 2013
@@ -21,8 +21,10 @@ package org.apache.maven.plugin.war.util
import junit.framework.TestCase;
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.stub.AbstractArtifactStub;
+import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.codehaus.plexus.interpolation.InterpolationException;
/**
@@ -124,55 +126,35 @@ public class MappingUtilsTest
// A very dumb stub used to test the mappings
class TestArtifactStub
-extends AbstractArtifactStub
+extends ArtifactStub
{
-
-protected String groupId;
-
-protected String artifactId;
-
-protected String version;
-
+/**
+ * Override in this class because there is no setter in ArtifactStub.
+ */
protected String classifier;
-protected String type = jar;
-
public TestArtifactStub()
{
-super( null );
+super();
+setType( jar );
}
-
-public String getGroupId()
+/**
+ * Override in this class because ArtifactStub always returns null.
+ */
+@Override
+public ArtifactHandler getArtifactHandler()
{
-return groupId;
+return new DefaultArtifactHandler( getType() );
}
-public void setGroupId( String groupId )
+@Override
+public String getBaseVersion()
{
-this.groupId = groupId;
-}
-
-public String getArtifactId()
-{
-return artifactId;
-}
-
-public void setArtifactId( String artifactId )
-{
-this.artifactId = artifactId;
-}
-
-public String getVersion()
-{
-return version;
-}
-
-public void setVersion( String version )
-{
-this.version = version;
+ return getVersion();
}
+@Override
public String getClassifier()
{
return classifier;
@@ -182,16 +164,5 @@ public class MappingUtilsTest
{
this.classifier = classifier;
}
-
-
-public String getType()
-{
-return type;
-}
-
-public void setType( String type )
-{
-this.type = type;
-}
}
}
svn commit: r1508467 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Author: dennisl
Date: Tue Jul 30 14:36:02 2013
New Revision: 1508467
URL: http://svn.apache.org/r1508467
Log:
Clean up after refactoring.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=1508467r1=1508466r2=1508467view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
Tue Jul 30 14:36:02 2013
@@ -19,16 +19,10 @@ package org.apache.maven.plugin.war.util
* under the License.
*/
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
-import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-import org.codehaus.plexus.interpolation.ValueSource;
/**
* Utilities used to evaluate expression.
@@ -79,38 +73,4 @@ public class MappingUtils
return value;
}
-
-/**
- * Internal implementation of {@link ValueSource}
- */
-static class PropertiesInterpolationValueSource
-implements ValueSource
-{
-
-private final Properties properties;
-
-public PropertiesInterpolationValueSource( Properties properties )
-{
-this.properties = properties;
-}
-
-public Object getValue( String key )
-{
-return properties.getProperty( key );
-}
-
-public void clearFeedback()
-{
-// nothing here
-
-}
-
-public List getFeedback()
-{
-// nothing here just NPE free
-return Collections.EMPTY_LIST;
-}
-
-}
-
}
svn commit: r1508598 - in /maven/skins/trunk: maven-application-skin/src/it/sample/src/site/apt/ maven-classic-skin/src/it/sample/src/site/apt/ maven-default-skin/src/it/sample/src/site/apt/ maven-sty
Author: dennisl
Date: Tue Jul 30 20:07:23 2013
New Revision: 1508598
URL: http://svn.apache.org/r1508598
Log:
Add missing license headers.
Modified:
maven/skins/trunk/maven-application-skin/src/it/sample/src/site/apt/index.apt.vm
maven/skins/trunk/maven-classic-skin/src/it/sample/src/site/apt/index.apt.vm
maven/skins/trunk/maven-default-skin/src/it/sample/src/site/apt/index.apt.vm
maven/skins/trunk/maven-stylus-skin/src/it/mskins-10/verify.groovy
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/src/site/apt/index.apt.vm
maven/skins/trunk/maven-stylus-skin/src/it/mskins-20/verify.groovy
maven/skins/trunk/maven-stylus-skin/src/it/sample/src/site/apt/index.apt.vm
maven/skins/trunk/maven-stylus-skin/src/it/sample/verify.groovy
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css
Modified:
maven/skins/trunk/maven-application-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1508598r1=1508597r2=1508598view=diff
==
---
maven/skins/trunk/maven-application-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/skins/trunk/maven-application-skin/src/it/sample/src/site/apt/index.apt.vm
Tue Jul 30 20:07:23 2013
@@ -6,6 +6,26 @@
2011-10-15
--
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ License); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
${skinName} test
This is a test for ${skinName}.
Modified:
maven/skins/trunk/maven-classic-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1508598r1=1508597r2=1508598view=diff
==
---
maven/skins/trunk/maven-classic-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/skins/trunk/maven-classic-skin/src/it/sample/src/site/apt/index.apt.vm
Tue Jul 30 20:07:23 2013
@@ -6,6 +6,26 @@
2011-10-15
--
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ License); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
${skinName} test
This is a test for ${skinName}.
Modified:
maven/skins/trunk/maven-default-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1508598r1=1508597r2=1508598view=diff
==
---
maven/skins/trunk/maven-default-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/skins/trunk/maven-default-skin/src/it/sample/src/site/apt/index.apt.vm
Tue Jul 30 20:07:23 2013
@@ -6,6 +6,26 @@
2011-10-15
--
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0
svn commit: r1508605 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css
Author: dennisl
Date: Tue Jul 30 20:22:18 2013
New Revision: 1508605
URL: http://svn.apache.org/r1508605
Log:
Replace tabs with spaces.
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css
Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css?rev=1508605r1=1508604r2=1508605view=diff
==
--- maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css
(original)
+++ maven/skins/trunk/maven-stylus-skin/src/main/resources/css/print.css Tue
Jul 30 20:22:18 2013
@@ -18,9 +18,9 @@
*/
#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks,
#leftColumn, #navColumn {
- display: none !important;
+ display: none !important;
}
#bodyColumn, body.docs div.docs {
- margin: 0 !important;
- border: none !important
+ margin: 0 !important;
+ border: none !important
}
svn commit: r1508606 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Author: dennisl Date: Tue Jul 30 20:22:37 2013 New Revision: 1508606 URL: http://svn.apache.org/r1508606 Log: No, this is the Stylus skin. Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm?rev=1508606r1=1508605r2=1508606view=diff == --- maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm Tue Jul 30 20:22:37 2013 @@ -23,7 +23,7 @@ | Generated by Apache Maven Doxia#if( $doxiaVersion ) $doxiaVersion #end #if ($skipGenerationDate == 'false')at $dateFormat.format( $currentDate ) #end - | Rendered using Apache Maven Fluido Skin @project.version@ + | Rendered using Apache Maven Stylus Skin @project.version@ -- #macro ( link $href $name ) #if ( $href.toLowerCase().startsWith(http:/) || $href.toLowerCase().startsWith(https:/) ||
svn commit: r1508616 - /maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html
Author: dennisl Date: Tue Jul 30 20:41:55 2013 New Revision: 1508616 URL: http://svn.apache.org/r1508616 Log: Add missing license header. Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html?rev=1508616r1=1508615r2=1508616view=diff == --- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html (original) +++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/test/resources/anchorTest/testAnchor.html Tue Jul 30 20:41:55 2013 @@ -1,3 +1,21 @@ +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- html body
svn commit: r1508630 - in /maven/doxia/doxia/trunk: doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm doxia-sink-api/src/site/apt/index.apt
Author: dennisl Date: Tue Jul 30 21:12:38 2013 New Revision: 1508630 URL: http://svn.apache.org/r1508630 Log: Add missing license headers. Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm maven/doxia/doxia/trunk/doxia-sink-api/src/site/apt/index.apt Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm?rev=1508630r1=1508629r2=1508630view=diff == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm Tue Jul 30 21:12:38 2013 @@ -6,6 +6,26 @@ 2011-09-13 -- +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ License); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + A Doxia module for Simplified DocBook documents. DocBook format is supported both as source and target formats. This module is not configured, by default, in the maven-site-plugin. To use this module in the Modified: maven/doxia/doxia/trunk/doxia-sink-api/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/src/site/apt/index.apt?rev=1508630r1=1508629r2=1508630view=diff == --- maven/doxia/doxia/trunk/doxia-sink-api/src/site/apt/index.apt (original) +++ maven/doxia/doxia/trunk/doxia-sink-api/src/site/apt/index.apt Tue Jul 30 21:12:38 2013 @@ -6,6 +6,26 @@ 2010-05-08 - +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ License); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Doxia Sink API The Sink interface is a generic markup language interface provided as a Java API.
svn commit: r2635 - in /release/maven/plugins: maven-one-plugin-1.3-source-release.zip maven-one-plugin-1.3-source-release.zip.asc maven-one-plugin-1.3-source-release.zip.md5
Author: dennisl Date: Tue Jul 30 21:27:09 2013 New Revision: 2635 Log: Release maven-one-plugin:1.3. Note that no files were removed, because there weren't any here previously. Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip (with props) release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc (with props) release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 (with props) Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc == --- release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc (added) +++ release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc Tue Jul 30 21:27:09 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR9DgaM81nM69exFIRAuh+AKCwg4VmVh2QNhLk4aecPl/YxAdikwCeLQ7W +3k+TLCfWUhwcPTApF3T3K5s= +=UcdA +-END PGP SIGNATURE- Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc -- svn:eol-style = native Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 == --- release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 (added) +++ release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 Tue Jul 30 21:27:09 2013 @@ -0,0 +1 @@ +8c94152e2b7c3737496333227ac33c6d \ No newline at end of file Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 -- svn:eol-style = native
svn commit: r2635 - in /release/maven/plugins: maven-one-plugin-1.3-source-release.zip maven-one-plugin-1.3-source-release.zip.asc maven-one-plugin-1.3-source-release.zip.md5
Author: dennisl Date: Tue Jul 30 21:27:09 2013 New Revision: 2635 Log: Release maven-one-plugin:1.3. Note that no files were removed, because there weren't any here previously. Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip (with props) release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc (with props) release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 (with props) Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc == --- release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc (added) +++ release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc Tue Jul 30 21:27:09 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR9DgaM81nM69exFIRAuh+AKCwg4VmVh2QNhLk4aecPl/YxAdikwCeLQ7W +3k+TLCfWUhwcPTApF3T3K5s= +=UcdA +-END PGP SIGNATURE- Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.asc -- svn:eol-style = native Added: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 == --- release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 (added) +++ release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 Tue Jul 30 21:27:09 2013 @@ -0,0 +1 @@ +8c94152e2b7c3737496333227ac33c6d \ No newline at end of file Propchange: release/maven/plugins/maven-one-plugin-1.3-source-release.zip.md5 -- svn:eol-style = native
svn commit: r1508637 - /maven/site/trunk/content/apt/plugins/index.apt
Author: dennisl
Date: Tue Jul 30 21:31:58 2013
New Revision: 1508637
URL: http://svn.apache.org/r1508637
Log:
Release the final version of Maven One Plugin, version 1.3, and move it to the
retired section.
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=1508637r1=1508636r2=1508637view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Tue Jul 30 21:31:58 2013
@@ -7,7 +7,7 @@
Olivier Lamy
Benson Margulies
-
- 2013-07-19
+ 2013-07-30
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -148,8 +148,6 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-jarsigner-plugin/} jarsigner}} | B |
1.2 | 2009-09-30 | Signs or verifies project artifacts. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jarsigner-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MJARSIGNER}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-one-plugin/} one}} | B |
1.2 | 2007-09-12 | A plugin for interacting with legacy Maven 1.x
repositories and builds. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MONE}JIRA}}
-*--++--++--+++
| {{{/plugins/maven-patch-plugin/} patch}} | B |
1.1.1| 2010-01-06 | Use the gnu patch tool to apply patch files to
source code. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-patch-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPATCH}JIRA}}
*--++--++--+++
| {{{/plugins/maven-pdf-plugin/} pdf}} | B |
1.2 | 2012-11-08 | Generate a PDF version of your project's
documentation. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pdf-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MPDF}JIRA}}
@@ -192,6 +190,8 @@ Available Plugins
*--++--+---+--+
| {{{/plugins/maven-idea-plugin/} idea}} | B |
2.2.1| 2013-07-26| Create/update an IDEA workspace for the
current project (individual modules are created as IDEA modules)
*--++--+---+--+
+| {{{/plugins/maven-one-plugin/} one}} | B |
1.3 | 2013-07-30| A plugin for interacting with legacy Maven
1.x repositories and builds.
+*--++--+---+--+
* Outside The Maven Land
svn commit: r871960 [12/14] - in /websites/production/maven/content/plugins/maven-one-plugin: ./ apidocs/ apidocs/org/apache/maven/plugins/mavenone/ apidocs/org/apache/maven/plugins/mavenone/class-use
Modified: websites/production/maven/content/plugins/maven-one-plugin/xref/index.html == --- websites/production/maven/content/plugins/maven-one-plugin/xref/index.html (original) +++ websites/production/maven/content/plugins/maven-one-plugin/xref/index.html Tue Jul 30 21:32:21 2013 @@ -1,9 +1,9 @@ -!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Frameset//EN DTD/xhtml1-frameset.dtd +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Frameset//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd; html xml:lang=en lang=en head - meta http-equiv=content-type content=text/html; charset=ISO-8859-1 / - titleMaven One Plugin 1.2 Reference/title + meta http-equiv=content-type content=text/html; charset=UTF-8 / + titleApache Maven One Plugin (RETIRED) 1.3 Reference/title /head frameset cols=20%,80% frameset rows=30%,70% @@ -21,4 +21,3 @@ /noframes /frameset /html - Added: websites/production/maven/content/plugins/maven-one-plugin/xref/org/apache/maven/plugins/mavenone/HelpMojo.html == --- websites/production/maven/content/plugins/maven-one-plugin/xref/org/apache/maven/plugins/mavenone/HelpMojo.html (added) +++ websites/production/maven/content/plugins/maven-one-plugin/xref/org/apache/maven/plugins/mavenone/HelpMojo.html Tue Jul 30 21:32:21 2013 @@ -0,0 +1,451 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; +html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en +head +meta http-equiv=content-type content=text/html; charset=UTF-8 / +titleHelpMojo xref/title +link type=text/css rel=stylesheet href=../../../../../stylesheet.css / +/head +body +div id=overviewa href=../../../../../../apidocs/org/apache/maven/plugins/mavenone/HelpMojo.htmlView Javadoc/a/divpre + +a class=jxr_linenumber name=1 href=#11/a strong class=jxr_keywordpackage/strong org.apache.maven.plugins.mavenone; +a class=jxr_linenumber name=2 href=#22/a +a class=jxr_linenumber name=3 href=#33/a strong class=jxr_keywordimport/strong org.apache.maven.plugin.AbstractMojo; +a class=jxr_linenumber name=4 href=#44/a strong class=jxr_keywordimport/strong org.apache.maven.plugin.MojoExecutionException; +a class=jxr_linenumber name=5 href=#55/a +a class=jxr_linenumber name=6 href=#66/a strong class=jxr_keywordimport/strong org.w3c.dom.Document; +a class=jxr_linenumber name=7 href=#77/a strong class=jxr_keywordimport/strong org.w3c.dom.Element; +a class=jxr_linenumber name=8 href=#88/a strong class=jxr_keywordimport/strong org.w3c.dom.Node; +a class=jxr_linenumber name=9 href=#99/a strong class=jxr_keywordimport/strong org.w3c.dom.NodeList; +a class=jxr_linenumber name=10 href=#1010/a strong class=jxr_keywordimport/strong org.xml.sax.SAXException; +a class=jxr_linenumber name=11 href=#/a +a class=jxr_linenumber name=12 href=#1212/a strong class=jxr_keywordimport/strong javax.xml.parsers.DocumentBuilder; +a class=jxr_linenumber name=13 href=#1313/a strong class=jxr_keywordimport/strong javax.xml.parsers.DocumentBuilderFactory; +a class=jxr_linenumber name=14 href=#1414/a strong class=jxr_keywordimport/strong javax.xml.parsers.ParserConfigurationException; +a class=jxr_linenumber name=15 href=#1515/a strong class=jxr_keywordimport/strong java.io.IOException; +a class=jxr_linenumber name=16 href=#1616/a strong class=jxr_keywordimport/strong java.io.InputStream; +a class=jxr_linenumber name=17 href=#1717/a strong class=jxr_keywordimport/strong java.util.ArrayList; +a class=jxr_linenumber name=18 href=#1818/a strong class=jxr_keywordimport/strong java.util.Iterator; +a class=jxr_linenumber name=19 href=#1919/a strong class=jxr_keywordimport/strong java.util.List; +a class=jxr_linenumber name=20 href=#2020/a +a class=jxr_linenumber name=21 href=#2121/a em class=jxr_javadoccomment/**/em +a class=jxr_linenumber name=22 href=#/a em class=jxr_javadoccomment * Display help information on maven-one-plugin.lt;br/gt;/em +a class=jxr_linenumber name=23 href=#2323/a em class=jxr_javadoccomment * Call lt;codegt;mvn one:help -Ddetail=true -Dgoal=amp;lt;goal-nameamp;gt;lt;/codegt; to display parameter details./em +a class=jxr_linenumber name=24 href=#2424/a em class=jxr_javadoccomment * @author/em +a class=jxr_linenumber name=25 href=#2525/a em class=jxr_javadoccomment * @version/em +a class=jxr_linenumber name=26 href=#2626/a em class=jxr_javadoccomment * @goal help/em +a class=jxr_linenumber name=27 href=#2727/a em class=jxr_javadoccomment * @requiresProject false/em +a class=jxr_linenumber name=28 href=#2828/a em class=jxr_javadoccomment * @threadSafe/em +a class=jxr_linenumber name=29 href=#2929/a em class=jxr_javadoccomment *//em +a class=jxr_linenumber name=30
svn commit: r871964 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr/ maven
Author: dennisl Date: Tue Jul 30 21:36:09 2013 New Revision: 871964 Log: Publishing svnmucc operation to maven site by dennisl Added: websites/production/maven/content/ - copied from r871960, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r871962, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r871962, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r871962, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r871962, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r871962, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r871962, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r871962, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r871962, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r871962, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r871962, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r871962, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r871962, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r871962, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r871962, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r871962, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r871962, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r871962, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r871962, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r871962, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r871962, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r871962
svn commit: r1508645 - /maven/plugins/trunk/pom.xml
Author: dennisl Date: Tue Jul 30 21:42:33 2013 New Revision: 1508645 URL: http://svn.apache.org/r1508645 Log: Retire maven-one-plugin. Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1508645r1=1508644r2=1508645view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Tue Jul 30 21:42:33 2013 @@ -71,7 +71,6 @@ under the License. modulemaven-jarsigner-plugin/module modulemaven-javadoc-plugin/module modulemaven-linkcheck-plugin/module -modulemaven-one-plugin/module modulemaven-patch-plugin/module modulemaven-pdf-plugin/module modulemaven-pmd-plugin/module
svn commit: r1508648 - in /maven: plugins/trunk/maven-one-plugin/ retired/maven-one-plugin/
Author: dennisl Date: Tue Jul 30 21:45:13 2013 New Revision: 1508648 URL: http://svn.apache.org/r1508648 Log: Retire maven-one-plugin. Added: maven/retired/maven-one-plugin/ - copied from r1508647, maven/plugins/trunk/maven-one-plugin/ Removed: maven/plugins/trunk/maven-one-plugin/
svn commit: r1508649 - /maven/retired/maven-one-plugin/pom.xml
Author: dennisl Date: Tue Jul 30 21:49:19 2013 New Revision: 1508649 URL: http://svn.apache.org/r1508649 Log: Update SCM URLs after retirement. Modified: maven/retired/maven-one-plugin/pom.xml Modified: maven/retired/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/retired/maven-one-plugin/pom.xml?rev=1508649r1=1508648r2=1508649view=diff == --- maven/retired/maven-one-plugin/pom.xml (original) +++ maven/retired/maven-one-plugin/pom.xml Tue Jul 30 21:49:19 2013 @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/retired/maven-one-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/retired/maven-one-plugin//developerConnection +urlhttp://svn.apache.org/viewvc/maven/retired/maven-one-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1507978 - /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Author: dennisl
Date: Mon Jul 29 09:08:48 2013
New Revision: 1507978
URL: http://svn.apache.org/r1507978
Log:
[MRRESOURCES-61] processed resources are added to main and test resources
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1507978r1=1507977r2=1507978view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Mon Jul 29 09:08:48 2013
@@ -265,14 +265,34 @@ public class ProcessRemoteResourcesMojo
private boolean skip;
/**
- * Attaches the resource to the project as a resource directory
+ * Attaches the resources to the project as a resource directory.
*
* @since 1.0-beta-1
+ * @deprecated Please use {@link #attachToMain} and {@link #attachToTest}
instead.
*/
+@Deprecated
@Parameter( defaultValue = true )
private boolean attached = true;
/**
+ * Attaches the resources to the main build of the project as a resource
+ * directory.
+ *
+ * @since 1.5
+ */
+@Parameter( defaultValue = true, property = attachToMain )
+private boolean attachToMain;
+
+/**
+ * Attaches the resources to the test build of the project as a resource
+ * directory.
+ *
+ * @since 1.5
+ */
+@Parameter( defaultValue = true, property = attachToTest )
+private boolean attachToTest;
+
+/**
* Additional properties to be passed to velocity.
* p/
* Several properties are automatically added:br/
@@ -507,12 +527,15 @@ public class ProcessRemoteResourcesMojo
// Push our newly generated resources directory into the
MavenProject so that
// these resources can be picked up by the
process-resources phase.
//
-if ( attached )
+Resource resource = new Resource();
+resource.setDirectory( outputDirectory.getAbsolutePath() );
+// MRRESOURCES-61 handle main and test resources separately
+if ( attached attachToMain )
{
-Resource resource = new Resource();
-resource.setDirectory(
outputDirectory.getAbsolutePath() );
-
project.getResources().add( resource );
+}
+if ( attached attachToTest )
+{
project.getTestResources().add( resource );
}
svn commit: r1507980 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Author: dennisl Date: Mon Jul 29 09:12:25 2013 New Revision: 1507980 URL: http://svn.apache.org/r1507980 Log: Add used but undeclared dependencies. Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1507980r1=1507979r2=1507980view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Mon Jul 29 09:12:25 2013 @@ -134,6 +134,11 @@ under the License. artifactIdplexus-interpolation/artifactId version1.12/version /dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId + version1.5.15/version +/dependency !-- other -- dependency @@ -150,6 +155,12 @@ under the License. scopetest/scope /dependency dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-container-default/artifactId + version1.0-alpha-9-stable-1/version + scopetest/scope +/dependency +dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-plugin-testing-harness/artifactId version1.1/version
git commit: Add missing license header.
Updated Branches: refs/heads/master b83de53e8 - a58b91819 Add missing license header. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a58b9181 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a58b9181 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a58b9181 Branch: refs/heads/master Commit: a58b91819c42c0a5a8616dc5562ba42287fa0f24 Parents: b83de53 Author: Dennis Lundberg denn...@apache.org Authored: Sun Jul 28 21:49:05 2013 +0200 Committer: Dennis Lundberg denn...@apache.org Committed: Sun Jul 28 21:49:05 2013 +0200 -- maven-plugin-api/src/test/resources/plugin.xml | 20 1 file changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a58b9181/maven-plugin-api/src/test/resources/plugin.xml -- diff --git a/maven-plugin-api/src/test/resources/plugin.xml b/maven-plugin-api/src/test/resources/plugin.xml index c5d4e8a..49db316 100644 --- a/maven-plugin-api/src/test/resources/plugin.xml +++ b/maven-plugin-api/src/test/resources/plugin.xml @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + plugin descriptionplugin-description/description groupIdorg.apache.maven.plugins/groupId
svn commit: r1507710 - /maven/plugins/trunk/maven-one-plugin/pom.xml
Author: dennisl Date: Sat Jul 27 21:13:31 2013 New Revision: 1507710 URL: http://svn.apache.org/r1507710 Log: [maven-release-plugin] prepare release maven-one-plugin-1.3 Modified: maven/plugins/trunk/maven-one-plugin/pom.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?rev=1507710r1=1507709r2=1507710view=diff == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Sat Jul 27 21:13:31 2013 @@ -19,7 +19,7 @@ specific language governing permissions under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-one-plugin/artifactId - version1.3-SNAPSHOT/version + version1.3/version packagingmaven-plugin/packaging nameApache Maven One Plugin (RETIRED)/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-one-plugin-1.3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-one-plugin-1.3/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-one-plugin-1.3/url /scm issueManagement systemJIRA/system @@ -148,9 +148,9 @@ under the License. phaseintegration-test/phase configuration tasks -echo/echo/echo/echo/echo/ -echo level='warning'NO INTEGRATION TESTS DEFINED/echo -echo/echo/echo/echo/echo/ +echo /echo /echo /echo /echo / +echo level=warningNO INTEGRATION TESTS DEFINED/echo +echo /echo /echo /echo /echo / /tasks /configuration goals
svn commit: r1507712 - /maven/plugins/trunk/maven-one-plugin/pom.xml
Author: dennisl Date: Sat Jul 27 21:13:43 2013 New Revision: 1507712 URL: http://svn.apache.org/r1507712 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-one-plugin/pom.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?rev=1507712r1=1507711r2=1507712view=diff == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Sat Jul 27 21:13:43 2013 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-one-plugin/artifactId - version1.3/version + version1.4-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven One Plugin (RETIRED)/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-one-plugin-1.3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-one-plugin-1.3/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-one-plugin-1.3/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-one-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1507711 - /maven/plugins/tags/maven-one-plugin-1.3/
Author: dennisl Date: Sat Jul 27 21:13:40 2013 New Revision: 1507711 URL: http://svn.apache.org/r1507711 Log: [maven-release-plugin] copy for tag maven-one-plugin-1.3 Added: maven/plugins/tags/maven-one-plugin-1.3/ - copied from r1507710, maven/plugins/trunk/maven-one-plugin/
svn commit: r871477 - /websites/production/maven/content/plugins-archives/maven-one-plugin-1.3/
Author: dennisl Date: Sat Jul 27 21:18:00 2013 New Revision: 871477 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/plugins-archives/maven-one-plugin-1.3 Added: websites/production/maven/content/plugins-archives/maven-one-plugin-1.3/
svn commit: r871478 [9/11] - in /websites/production/maven/content/plugins-archives/maven-one-plugin-1.3: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/mave
/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/843c139514b33ef9121f6e4bfd2ef547?d=mmamp;s=60; alt= //tdtda name=baerrach/abaerrach/tdtdBarrie Treloar/tdtda class=externa lLink href=mailto:baerr...@apache.org;baerr...@apache.org/a/tdtd-/tdtdPMC Member/tdtdAustralia/Adelaide/tdtdspan id=developer-2Australia/Adelaide/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/c4fd4aa87482d9ecf81173cad089f0c3?d=mmamp;s=60; alt= //tdtda name=bimargulies/abimargulies/tdtdBenson Margulies/tdtda class=externalLink href=mailto:bimargul...@apache.org;bimargul...@apache.org/a/tdtd-/tdtdPMC Member/tdtdAmerica/New_York/tdtdspan id=developer-3America/New_York/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/1db61ec29963d4a77ef2275140144fd4?d=mmamp;s=60; alt= //tdtda name=brett/abrett/tdtdBrett Porter/tdtda class=externalLink href=mailto:br...@apache.org;br...@apache.org/a/tdtdASF/tdtdPMC Member/tdtd+10/tdtdspan id=developer-4+10/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar /5f46e5f33b0d23121af7113258485a2b?d=mmamp;s=60 alt= //tdtda name=brianf/abrianf/tdtdBrian Fox/tdtda class=externalLink href=mailto:bri...@apache.org;bri...@apache.org/a/tdtdSonatype/tdtdPMC Member/tdtd-5/tdtdspan id=developer-5-5/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/6559d4b2de15cb1433fc13c34599e4c7?d=mmamp;s=60; alt= //tdtda name=carlos/acarlos/tdtdCarlos Sanchez/tdtda class=externalLink href=mailto:car...@apache.org;car...@apache.org/a/tdtdASF/tdtdPMC Member/tdtd+1/tdtdspan id=developer-6+1/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/c8686cad245196c9e392201ad7bb364f?d=mmamp;s=60; alt= //tdtda name=dennisl/adennisl/tdtdDennis Lundberg/tdtda class=externalLink href=mailto:denn...@apache.org;denn...@apache.org/a/tdtdASF/tdtdPMC Member/tdtd+1/tdtdspan id=developer-7+1/spa n/td/trtr class=btdimg src=http://www.gravatar.com/avatar/be211eb53b665c51eb3f2e421bdc77cb?d=mmamp;s=60; alt= //tdtda name=dfabulich/adfabulich/tdtdDaniel Fabulich/tdtda class=externalLink href=mailto:dfabul...@apache.org;dfabul...@apache.org/a/tdtd-/tdtdPMC Member/tdtd-8/tdtdspan id=developer-8-8/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/638136a641ed5c512f446444339cf271?d=mmamp;s=60; alt= //tdtda name=dkulp/adkulp/tdtdDaniel Kulp/tdtda class=externalLink href=mailto:dk...@apache.org;dk...@apache.org/a/tdtdASF/tdtdPMC Member/tdtd-5/tdtdspan id=developer-9-5/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/efe7252f3b18253bf4318062ece95a3b?d=mmamp;s=60; alt= //tdtda name=evenisse/aevenisse/tdtdEmmanuel Venisse/tdtda class=externalLink href=mailto:eveni...@apache.org;eveni...@apache.org/a/ tdtdASF/tdtdPMC Member/tdtd+1/tdtdspan id=developer-10+1/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/35b0cc47b5e6d602734c636082d630df?d=mmamp;s=60; alt= //tdtda name=hboutemy/ahboutemy/tdtdHerv#xe9; Boutemy/tdtda class=externalLink href=mailto:hbout...@apache.org;hbout...@apache.org/a/tdtdASF/tdtdPMC Member/tdtdEurope/Paris/tdtdspan id=developer-11Europe/Paris/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/5eb06f355d82f3267f3db16c6359601e?d=mmamp;s=60; alt= //tdtda name=jdcasey/ajdcasey/tdtdJohn Casey/tdtda class=externalLink href=mailto:jdca...@apache.org;jdca...@apache.org/a/tdtdASF/tdtdPMC Member/tdtd-5/tdtdspan id=developer-12-5/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/3c2ad6b6efb1c84d9ff60259f8c8ef95?d=mmamp;s=60; alt= //tdtda name=krosenvold/akrosenvold/t dtdKristian Rosenvold/tdtda class=externalLink href=mailto:krosenv...@apache.org;krosenv...@apache.org/a/tdtd-/tdtdPMC Member/tdtd+1/tdtdspan id=developer-13+1/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/7575e2568caf22d6613fc0c4c6653363?d=mmamp;s=60; alt= //tdtda name=markh/amarkh/tdtdMark Hobson/tdtda class=externalLink href=mailto:ma...@apache.org;ma...@apache.org/a/tdtd-/tdtdPMC Member/tdtd0/tdtdspan id=developer-140/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/?d=blankamp;f=yamp;s=60; alt= //tdtda name=mkleint/amkleint/tdtdMilos Kleint/tdtd-/tdtd-/tdtdPMC Member/tdtd-/tdtdspan id=developer-15-/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/?d=blankamp;f=yamp;s=60; alt= //tdtda name=oching/a oching/tdtdMaria Odea B. Ching/tdtd-/tdtd-/tdtdPMC Member/tdtd-/tdtdspan id=developer-16-/span/td/trtr class=atdimg src=http://www.gravatar.com/avatar/caf8be8931e2b7a13d386a7d05053714?d=mmamp;s=60; alt= //tdtda name=pgier/apgier/tdtdPaul Gier/tdtda class=externalLink href=mailto:pg...@apache.org;pg...@apache.org/a/tdtdRed Hat/tdtdPMC Member/tdtd-6/tdtdspan id=developer-17-6/span/td/trtr class=btdimg src=http://www.gravatar.com/avatar/d035aeb839495240c58bbb03992ceda8?d=mmamp;s=60; alt= //tdtda name=rfscholte/arfscholte/tdtdRobert Scholte/tdtda class=externalLink href=mailto:rfscho...@apache.org
svn commit: r2584 - in /release/maven/plugins: maven-idea-plugin-2.2.1-source-release.zip maven-idea-plugin-2.2.1-source-release.zip.asc maven-idea-plugin-2.2.1-source-release.zip.md5
Author: dennisl Date: Fri Jul 26 20:05:13 2013 New Revision: 2584 Log: Release maven-idea-plugin:2.2.1. Note that no files were removed, because there weren't any here previously. Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip (with props) release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc (with props) release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 (with props) Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc == --- release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc Fri Jul 26 20:05:13 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR7sVpM81nM69exFIRAsQ7AJwI5SseS02MERpOlZtUF6+4kW+YAwCfQX6p +EsvWbkEJjlT17ScsZLYM8aQ= +=czv2 +-END PGP SIGNATURE- Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc -- svn:eol-style = native Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 == --- release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 (added) +++ release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 Fri Jul 26 20:05:13 2013 @@ -0,0 +1 @@ +5146ee86f954e5d765a21a8654e2ff9a \ No newline at end of file Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 -- svn:eol-style = native
svn commit: r2584 - in /release/maven/plugins: maven-idea-plugin-2.2.1-source-release.zip maven-idea-plugin-2.2.1-source-release.zip.asc maven-idea-plugin-2.2.1-source-release.zip.md5
Author: dennisl Date: Fri Jul 26 20:05:13 2013 New Revision: 2584 Log: Release maven-idea-plugin:2.2.1. Note that no files were removed, because there weren't any here previously. Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip (with props) release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc (with props) release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 (with props) Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc == --- release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc (added) +++ release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc Fri Jul 26 20:05:13 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR7sVpM81nM69exFIRAsQ7AJwI5SseS02MERpOlZtUF6+4kW+YAwCfQX6p +EsvWbkEJjlT17ScsZLYM8aQ= +=czv2 +-END PGP SIGNATURE- Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.asc -- svn:eol-style = native Added: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 == --- release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 (added) +++ release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 Fri Jul 26 20:05:13 2013 @@ -0,0 +1 @@ +5146ee86f954e5d765a21a8654e2ff9a \ No newline at end of file Propchange: release/maven/plugins/maven-idea-plugin-2.2.1-source-release.zip.md5 -- svn:eol-style = native
svn commit: r871308 - in /websites/production/maven/content/plugins/maven-idea-plugin: ./ apidocs/ apidocs/org/apache/maven/plugin/idea/ apidocs/org/apache/maven/plugin/idea/class-use/ cobertura/ css/
Author: dennisl Date: Fri Jul 26 20:10:58 2013 New Revision: 871308 Log: Site checkin for project Apache Maven IDEA Plugin (RETIRED) [This commit notification would consist of 63 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1507422 - /maven/site/trunk/content/apt/plugins/index.apt
Author: dennisl
Date: Fri Jul 26 20:20:54 2013
New Revision: 1507422
URL: http://svn.apache.org/r1507422
Log:
Release the final version of Maven IDEA Plugin, version 2.2.1, and move it to
the retired section.
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=1507422r1=1507421r2=1507422view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Fri Jul 26 20:20:54 2013
@@ -178,8 +178,6 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-eclipse-plugin/} eclipse}} | B |
2.9 | 2012-02-14 | Generate an Eclipse project file for the current
project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-idea-plugin/} idea}} | B |
2.2 | 2008-08-08 | Create/update an IDEA workspace for the current
project (individual modules are created as IDEA modules) |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MIDEA}JIRA}}
-*--++--++--+++
\* Build or Reporting plugin
@@ -187,6 +185,14 @@ Available Plugins
Previous archived versions of plugins are located
{{{http://maven.apache.org/plugins-archives/}http://maven.apache.org/plugins-archives/}}.
+* Retired
+
+*--++--+---+--+
+|| Plugin || Type* ||
Version || Retired Date || Description
+*--++--+---+--+
+| {{{/plugins/maven-idea-plugin/} idea}} | B |
2.2.1| 2013-07-26| Create/update an IDEA workspace for the
current project (individual modules are created as IDEA modules)
+*--++--+---+--+
+
* Outside The Maven Land
** At codehaus.org
svn commit: r871312 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr/ maven
Author: dennisl Date: Fri Jul 26 20:25:11 2013 New Revision: 871312 Log: Publishing svnmucc operation to maven site by dennisl Added: websites/production/maven/content/ - copied from r871309, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r871311, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r871311, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r871311, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r871311, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r871311, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r871311, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r871311, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r871311, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r871311, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r871311, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r871311, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r871311, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r871311, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r871311, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r871311, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r871311, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r871311, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r871311, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r871311, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r871311, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r871311
svn commit: r2585 - in /release/maven/shared: maven-model-converter-2.3-source-release.zip maven-model-converter-2.3-source-release.zip.asc maven-model-converter-2.3-source-release.zip.md5
Author: dennisl Date: Fri Jul 26 20:35:40 2013 New Revision: 2585 Log: Release maven-model-converter:2.3. Note that no files were removed, because there weren't any here previously. Added: release/maven/shared/maven-model-converter-2.3-source-release.zip (with props) release/maven/shared/maven-model-converter-2.3-source-release.zip.asc (with props) release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 (with props) Added: release/maven/shared/maven-model-converter-2.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/shared/maven-model-converter-2.3-source-release.zip.asc == --- release/maven/shared/maven-model-converter-2.3-source-release.zip.asc (added) +++ release/maven/shared/maven-model-converter-2.3-source-release.zip.asc Fri Jul 26 20:35:40 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR7toyM81nM69exFIRAgzjAJ4hqu6rWJvq+XaqPH7DB5gucft25wCfeGvf +6EIPUeNxd78KbxeLH8eUKj8= +=cY79 +-END PGP SIGNATURE- Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip.asc -- svn:eol-style = native Added: release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 == --- release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 (added) +++ release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 Fri Jul 26 20:35:40 2013 @@ -0,0 +1 @@ +88de7dfc42121848ee5459ecd2d5ec26 \ No newline at end of file Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 -- svn:eol-style = native
svn commit: r2585 - in /release/maven/shared: maven-model-converter-2.3-source-release.zip maven-model-converter-2.3-source-release.zip.asc maven-model-converter-2.3-source-release.zip.md5
Author: dennisl Date: Fri Jul 26 20:35:40 2013 New Revision: 2585 Log: Release maven-model-converter:2.3. Note that no files were removed, because there weren't any here previously. Added: release/maven/shared/maven-model-converter-2.3-source-release.zip (with props) release/maven/shared/maven-model-converter-2.3-source-release.zip.asc (with props) release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 (with props) Added: release/maven/shared/maven-model-converter-2.3-source-release.zip == Binary file - no diff available. Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/shared/maven-model-converter-2.3-source-release.zip.asc == --- release/maven/shared/maven-model-converter-2.3-source-release.zip.asc (added) +++ release/maven/shared/maven-model-converter-2.3-source-release.zip.asc Fri Jul 26 20:35:40 2013 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.7 (MingW32) + +iD8DBQBR7toyM81nM69exFIRAgzjAJ4hqu6rWJvq+XaqPH7DB5gucft25wCfeGvf +6EIPUeNxd78KbxeLH8eUKj8= +=cY79 +-END PGP SIGNATURE- Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip.asc -- svn:eol-style = native Added: release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 == --- release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 (added) +++ release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 Fri Jul 26 20:35:40 2013 @@ -0,0 +1 @@ +88de7dfc42121848ee5459ecd2d5ec26 \ No newline at end of file Propchange: release/maven/shared/maven-model-converter-2.3-source-release.zip.md5 -- svn:eol-style = native
svn commit: r1507427 - /maven/site/trunk/content/apt/shared/index.apt
Author: dennisl
Date: Fri Jul 26 20:44:34 2013
New Revision: 1507427
URL: http://svn.apache.org/r1507427
Log:
Release the final version of Maven Model Converter, version 2.3, and move it
to the retired section.
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=1507427r1=1507426r2=1507427view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Fri Jul 26 20:44:34 2013
@@ -33,8 +33,6 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-jarsigner/} maven-jarsigner}} |
1.0 | 2011-11-21| This component provides some utilities to
sign/verify jars/files in your Mojos. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} |
{{{http://jira.codehaus.org/browse/MSHARED/component/15255}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | 2007-08-22| Converts between version 3.0.0 and version
4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/13272}JIRA}}
-*+--+---+--++-+
| {{{/shared/maven-reporting-api/} maven-reporting-api}} |
3.0 | 2010-05-12| API to manage report generation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-api/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/14413}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-reporting-exec/} maven-reporting-exec}} |
1.1 | 2013-04-18| API to manage report plugin executions with
Maven 3. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-reporting-exec/}SVN}}
| {{{http://jira.codehaus.org/browse/MSHARED/component/14716}JIRA}}
@@ -58,4 +56,12 @@ Shared Components
| {{{/shared/maven-verifier/} maven-verifier}} |
1.4 | 2012-12-21| 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}}
*+--+---+--++-+
- Archived version of shared libraries are located here
{{{http://maven.apache.org/shared-archives/}http://maven.apache.org/shared-archives/}}
\ No newline at end of file
+ Archived version of shared libraries are located here
{{{http://maven.apache.org/shared-archives/}http://maven.apache.org/shared-archives/}}
+
+* Retired
+
+*+--+---+--+
+|| Shared Component
|| Version || Retired Date || Description
+*+--+---+--+
+| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.3 | 2013-07-26| Converts between version 3.0.0 and version
4.0.0 models.
+*+--+---+--+
svn commit: r871316 - in /websites/production/maven/content/shared/maven-model-converter: ./ apidocs/ apidocs/org/apache/maven/model/converter/ apidocs/org/apache/maven/model/converter/class-use/ apid
Author: dennisl Date: Fri Jul 26 20:44:16 2013 New Revision: 871316 Log: Site checkin for project Apache Maven Model Converter (RETIRED) [This commit notification would consist of 63 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1507433 - /maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt
Author: dennisl Date: Fri Jul 26 20:52:49 2013 New Revision: 1507433 URL: http://svn.apache.org/r1507433 Log: Add more info from experience. Modified: maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt Modified: maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt?rev=1507433r1=1507432r2=1507433view=diff == --- maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt (original) +++ maven/site/trunk/content/apt/developers/retirement-plan-plugins.apt Fri Jul 26 20:52:49 2013 @@ -3,7 +3,7 @@ -- Dennis Lundberg -- - 2013-07-20 + 2013-07-26 -- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -130,6 +130,13 @@ but has moved to the Organization Pro [[1]] Go ahead with the standard release process, making sure that you follow the exceptions mentioned above regarding the site deployment. + [[1]] When updating the plugins page, move Maven Foo Plugin to under the + Retired heading. Remove the SVN and JIRA links and add + the date of retirement. + + [[1]] When updating the version in JIRA, do not add Y.Z+1 and make sure you + remove any future versions. + * Clean up after the release [[1]] Remove the plugin from the \modules\ section of the plugins aggregator POM. @@ -142,11 +149,9 @@ but has moved to the Organization Pro [[1]] Change the SCM URLs in the pom.xml to point to the new location. - [[1]] Put the JIRA project in read-only mode. (How to do this?) + [[1]] Add (RETIRED) at the end of the project name in JIRA. - [[1]] Update the plugins page, by moving Maven Foo Plugin to under the - Retired heading (does not exist yet). Remove the SVN and JIRA links and add - the date of retirement. + [[1]] Put the JIRA project in read-only mode. (How to do this?) [[1]] Announce the fact that the plugin has been retired/moved on the announce@m.a.o and users@m.a.o mailing lists. Explain to people what they
svn commit: r1507437 - /maven/plugins/trunk/maven-one-plugin/pom.xml
Author: dennisl Date: Fri Jul 26 21:01:45 2013 New Revision: 1507437 URL: http://svn.apache.org/r1507437 Log: [MONE-27] Upgrade to maven-model-converter 2.3 Modified: maven/plugins/trunk/maven-one-plugin/pom.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?rev=1507437r1=1507436r2=1507437view=diff == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Fri Jul 26 21:01:45 2013 @@ -78,7 +78,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-model-converter/artifactId - version2.3-SNAPSHOT/version + version2.3/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1507441 - /maven/plugins/trunk/pom.xml
Author: dennisl Date: Fri Jul 26 21:12:02 2013 New Revision: 1507441 URL: http://svn.apache.org/r1507441 Log: Retire maven-idea-plugin. Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1507441r1=1507440r2=1507441view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Jul 26 21:12:02 2013 @@ -64,7 +64,6 @@ under the License. modulemaven-ejb-plugin/module modulemaven-gpg-plugin/module modulemaven-help-plugin/module -modulemaven-idea-plugin/module modulemaven-install-plugin/module !--Moved to maven-3 profile as a workaround for MNG-3814 modulemaven-invoker-plugin/module--
svn commit: r1507450 - in /maven: plugins/trunk/maven-idea-plugin/ retired/maven-idea-plugin/
Author: dennisl Date: Fri Jul 26 21:19:51 2013 New Revision: 1507450 URL: http://svn.apache.org/r1507450 Log: Retire maven-idea-plugin. Added: maven/retired/maven-idea-plugin/ - copied from r1507449, maven/plugins/trunk/maven-idea-plugin/ Removed: maven/plugins/trunk/maven-idea-plugin/
svn commit: r1507453 - /maven/retired/maven-idea-plugin/pom.xml
Author: dennisl Date: Fri Jul 26 21:24:21 2013 New Revision: 1507453 URL: http://svn.apache.org/r1507453 Log: Update SCM URLs after retirement. Modified: maven/retired/maven-idea-plugin/pom.xml Modified: maven/retired/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/retired/maven-idea-plugin/pom.xml?rev=1507453r1=1507452r2=1507453view=diff == --- maven/retired/maven-idea-plugin/pom.xml (original) +++ maven/retired/maven-idea-plugin/pom.xml Fri Jul 26 21:24:21 2013 @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/retired/maven-idea-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/retired/maven-idea-plugin//developerConnection +urlhttp://svn.apache.org/viewvc/maven/retired/maven-idea-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1507458 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Fri Jul 26 21:26:45 2013 New Revision: 1507458 URL: http://svn.apache.org/r1507458 Log: Retire maven-model-converter. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1507458r1=1507457r2=1507458view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Fri Jul 26 21:26:45 2013 @@ -54,7 +54,6 @@ under the License. modulemaven-downloader/module modulemaven-filtering/module modulemaven-invoker/module -modulemaven-model-converter/module modulemaven-osgi/module modulemaven-plugin-enforcer/module modulemaven-project-utils/module
svn commit: r1507461 - in /maven: retired/maven-model-converter/ shared/trunk/maven-model-converter/
Author: dennisl Date: Fri Jul 26 21:27:30 2013 New Revision: 1507461 URL: http://svn.apache.org/r1507461 Log: Retire maven-model-converter. Added: maven/retired/maven-model-converter/ - copied from r1507460, maven/shared/trunk/maven-model-converter/ Removed: maven/shared/trunk/maven-model-converter/
svn commit: r1507475 - /maven/retired/maven-model-converter/pom.xml
Author: dennisl Date: Fri Jul 26 21:34:15 2013 New Revision: 1507475 URL: http://svn.apache.org/r1507475 Log: Update SCM URLs after retirement. Modified: maven/retired/maven-model-converter/pom.xml Modified: maven/retired/maven-model-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/retired/maven-model-converter/pom.xml?rev=1507475r1=1507474r2=1507475view=diff == --- maven/retired/maven-model-converter/pom.xml (original) +++ maven/retired/maven-model-converter/pom.xml Fri Jul 26 21:34:15 2013 @@ -34,9 +34,9 @@ descriptionConverts between version 3.0.0 and version 4.0.0 models./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/retired/maven-model-converter/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/retired/maven-model-converter/developerConnection +urlhttp://svn.apache.org/viewvc/maven/retired/maven-model-converter/url /scm issueManagement systemjira/system
svn commit: r1507151 - in /maven/shared/trunk/maven-script: maven-script-ant/pom.xml maven-script-beanshell/pom.xml
Author: dennisl Date: Thu Jul 25 23:10:15 2013 New Revision: 1507151 URL: http://svn.apache.org/r1507151 Log: Use released versions of Maven core dependencies. Modified: maven/shared/trunk/maven-script/maven-script-ant/pom.xml maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml Modified: maven/shared/trunk/maven-script/maven-script-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script/maven-script-ant/pom.xml?rev=1507151r1=1507150r2=1507151view=diff == --- maven/shared/trunk/maven-script/maven-script-ant/pom.xml (original) +++ maven/shared/trunk/maven-script/maven-script-ant/pom.xml Thu Jul 25 23:10:15 2013 @@ -34,12 +34,12 @@ under the License. dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.1-SNAPSHOT/version + version2.1.0/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.1-SNAPSHOT/version + version2.1.0/version /dependency dependency groupIdorg.apache.maven/groupId Modified: maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml?rev=1507151r1=1507150r2=1507151view=diff == --- maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml (original) +++ maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml Thu Jul 25 23:10:15 2013 @@ -34,7 +34,7 @@ under the License. dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.1-SNAPSHOT/version + version2.1.0/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1506506 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Wed Jul 24 11:57:42 2013 New Revision: 1506506 URL: http://svn.apache.org/r1506506 Log: Some love has now been applied. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1506506r1=1506505r2=1506506view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Wed Jul 24 11:57:42 2013 @@ -61,9 +61,7 @@ under the License. modulemaven-reporting-impl/module modulemaven-repository-builder/module modulemaven-runtime/module -!-- TODO: This seems to target Maven 3.x and needs some love modulemaven-script/module --- modulemaven-shared-io/module modulemaven-shared-jar/module modulemaven-shared-monitor/module
svn commit: r1506511 - /maven/shared/trunk/pom.xml
Author: dennisl Date: Wed Jul 24 12:09:00 2013 New Revision: 1506511 URL: http://svn.apache.org/r1506511 Log: Add maven-plugin-enforcer as a module. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1506511r1=1506510r2=1506511view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Wed Jul 24 12:09:00 2013 @@ -56,6 +56,7 @@ under the License. modulemaven-invoker/module modulemaven-model-converter/module modulemaven-osgi/module +modulemaven-plugin-enforcer/module modulemaven-project-utils/module modulemaven-reporting-api/module modulemaven-reporting-impl/module
svn commit: r1506512 - /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
Author: dennisl
Date: Wed Jul 24 12:09:30 2013
New Revision: 1506512
URL: http://svn.apache.org/r1506512
Log:
Fix typo.
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java?rev=1506512r1=1506511r2=1506512view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
Wed Jul 24 12:09:30 2013
@@ -72,7 +72,7 @@ public class XmlWriterUtilTest
{
XmlWriterUtil.writeLineBreak( xmlWriter );
writer.close();
-System.out.println( outpur = + output.toString() + x);
+System.out.println( output = + output.toString() + x);
assertTrue( StringUtils.countMatches( output.toString(),
XmlWriterUtil.LS ) == 1 );
}
svn commit: r1506544 - in /maven/plugins/trunk/maven-plugins: pom.xml src/site-docs/apt/index.apt src/site-docs/apt/index.apt.vm
Author: dennisl
Date: Wed Jul 24 13:21:07 2013
New Revision: 1506544
URL: http://svn.apache.org/r1506544
Log:
Follow ASF branding rules.
Added:
maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt.vm
- copied, changed from r1505399,
maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt
Removed:
maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt
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=1506544r1=1506543r2=1506544view=diff
==
--- maven/plugins/trunk/maven-plugins/pom.xml (original)
+++ maven/plugins/trunk/maven-plugins/pom.xml Wed Jul 24 13:21:07 2013
@@ -32,7 +32,7 @@ under the License.
version25-SNAPSHOT/version
packagingpom/packaging
- nameMaven Plugins/name
+ nameApache Maven Plugins/name
descriptionMaven Plugins/description
urlhttp://maven.apache.org/plugins//url
Copied: maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt.vm (from
r1505399, maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt.vm?p2=maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt.vmp1=maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.aptr1=1505399r2=1506544rev=1506544view=diff
==
--- maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt (original)
+++ maven/plugins/trunk/maven-plugins/src/site-docs/apt/index.apt.vm Wed Jul 24
13:21:07 2013
@@ -1,9 +1,9 @@
-
- Maven Plugins Parent POM
+ Introduction
-
Hervé Boutemy
-
- 2012-05-03
+ 2013-07-24
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven Plugins Parent POM
+${project.name}
This POM is the common parent of all of the {{{/plugins/}Maven plugins}}
in the Apache Maven project.
svn commit: r1506553 - in /maven/shared/trunk: maven-dependency-analyzer/src/site/apt/ maven-dependency-tree/src/site/apt/ maven-reporting-api/src/site/apt/ maven-reporting-exec/src/site/apt/ maven-re
Author: dennisl
Date: Wed Jul 24 13:48:48 2013
New Revision: 1506553
URL: http://svn.apache.org/r1506553
Log:
Add license header to documentation files.
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/site/apt/index.apt.vm
maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm
maven/shared/trunk/maven-reporting-api/src/site/apt/index.apt.vm
maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm
maven/shared/trunk/maven-reporting-impl/src/site/apt/index.apt.vm
maven/shared/trunk/maven-runtime/src/site/apt/examples/introspecting-a-class-loader.apt
maven/shared/trunk/maven-runtime/src/site/apt/examples/introspecting-a-class.apt
maven/shared/trunk/maven-runtime/src/site/apt/examples/introspecting-a-url.apt
maven/shared/trunk/maven-runtime/src/site/apt/index.apt.vm
maven/shared/trunk/maven-runtime/src/site/apt/usage.apt
maven/shared/trunk/maven-shared-jar/src/site/apt/index.apt.vm
Modified: maven/shared/trunk/maven-dependency-analyzer/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/site/apt/index.apt.vm?rev=1506553r1=1506552r2=1506553view=diff
==
--- maven/shared/trunk/maven-dependency-analyzer/src/site/apt/index.apt.vm
(original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/site/apt/index.apt.vm Wed
Jul 24 13:48:48 2013
@@ -6,6 +6,26 @@
2013-07-23
-
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ License); you may not use this file except in compliance
+ ~~ with the License. You may obtain a copy of the License at
+ ~~
+ ~~ http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied. See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
${project.name}
Analyzes the dependencies of a project for undeclared or unused artifacts.
Modified: maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm?rev=1506553r1=1506552r2=1506553view=diff
==
--- maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm Wed Jul
24 13:48:48 2013
@@ -6,6 +6,26 @@
2013-07-23
-
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ License); you may not use this file except in compliance
+ ~~ with the License. You may obtain a copy of the License at
+ ~~
+ ~~ http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied. See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
${project.name}
A tree-based API for resolution of Maven project dependencies.
Modified: maven/shared/trunk/maven-reporting-api/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-api/src/site/apt/index.apt.vm?rev=1506553r1=1506552r2=1506553view=diff
==
--- maven/shared/trunk/maven-reporting-api/src/site/apt/index.apt.vm (original)
+++ maven/shared/trunk/maven-reporting-api/src/site/apt/index.apt.vm Wed Jul 24
13:48:48 2013
@@ -6,6 +6,26 @@
2013-07-24
-
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ License); you may not use this file except in compliance
svn commit: r1506760 - in /maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies: invoker.properties verify.bsh
Author: dennisl Date: Wed Jul 24 22:34:51 2013 New Revision: 1506760 URL: http://svn.apache.org/r1506760 Log: Add missing license headers. Modified: maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/invoker.properties maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/verify.bsh Modified: maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/invoker.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/invoker.properties?rev=1506760r1=1506759r2=1506760view=diff == --- maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/invoker.properties (original) +++ maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/invoker.properties Wed Jul 24 22:34:51 2013 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + invoker.goals = validate Modified: maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/verify.bsh URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/verify.bsh?rev=1506760r1=1506759r2=1506760view=diff == --- maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/verify.bsh (original) +++ maven/shared/trunk/maven-artifact-resolver/src/it/minimal-dependencies/verify.bsh Wed Jul 24 22:34:51 2013 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.*; import java.util.*;
svn commit: r1506764 - in /maven/shared/trunk/maven-dependency-tree/src/it: maven-version/invoker.properties maven-version/verify.bsh mshared-167/invoker.properties mshared-167/verify.bsh verbose/invo
Author: dennisl Date: Wed Jul 24 22:42:56 2013 New Revision: 1506764 URL: http://svn.apache.org/r1506764 Log: Add missing license headers. Modified: maven/shared/trunk/maven-dependency-tree/src/it/maven-version/invoker.properties maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh maven/shared/trunk/maven-dependency-tree/src/it/verbose/invoker.properties maven/shared/trunk/maven-dependency-tree/src/it/verbose/verify.bsh Modified: maven/shared/trunk/maven-dependency-tree/src/it/maven-version/invoker.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/maven-version/invoker.properties?rev=1506764r1=1506763r2=1506764view=diff == --- maven/shared/trunk/maven-dependency-tree/src/it/maven-version/invoker.properties (original) +++ maven/shared/trunk/maven-dependency-tree/src/it/maven-version/invoker.properties Wed Jul 24 22:42:56 2013 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + invoker.goals = clean dependency:tree Modified: maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh?rev=1506764r1=1506763r2=1506764view=diff == --- maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh (original) +++ maven/shared/trunk/maven-dependency-tree/src/it/maven-version/verify.bsh Wed Jul 24 22:42:56 2013 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.*; import org.codehaus.plexus.util.*; Modified: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties?rev=1506764r1=1506763r2=1506764view=diff == --- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties (original) +++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties Wed Jul 24 22:42:56 2013 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + invoker.goals = clean dependency:tree Modified: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh?rev
svn commit: r1506768 - /maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties
Author: dennisl Date: Wed Jul 24 22:44:46 2013 New Revision: 1506768 URL: http://svn.apache.org/r1506768 Log: Add missing license headers. Modified: maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties Modified: maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties?rev=1506768r1=1506767r2=1506768view=diff == --- maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties (original) +++ maven/shared/trunk/maven-reporting-exec/src/it/aether/invoker.properties Wed Jul 24 22:44:46 2013 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + invoker.goals = site
svn commit: r1506771 - in /maven/shared/trunk/maven-script-interpreter/src/test/resources: bsh-test/verify.bsh groovy-test/verify.groovy
Author: dennisl
Date: Wed Jul 24 22:51:02 2013
New Revision: 1506771
URL: http://svn.apache.org/r1506771
Log:
Add missing license headers.
Modified:
maven/shared/trunk/maven-script-interpreter/src/test/resources/bsh-test/verify.bsh
maven/shared/trunk/maven-script-interpreter/src/test/resources/groovy-test/verify.groovy
Modified:
maven/shared/trunk/maven-script-interpreter/src/test/resources/bsh-test/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/test/resources/bsh-test/verify.bsh?rev=1506771r1=1506770r2=1506771view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/test/resources/bsh-test/verify.bsh
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/test/resources/bsh-test/verify.bsh
Wed Jul 24 22:51:02 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.*;
if ( !( basedir instanceof File ) )
Modified:
maven/shared/trunk/maven-script-interpreter/src/test/resources/groovy-test/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/test/resources/groovy-test/verify.groovy?rev=1506771r1=1506770r2=1506771view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/test/resources/groovy-test/verify.groovy
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/test/resources/groovy-test/verify.groovy
Wed Jul 24 22:51:02 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
if ( !( basedir instanceof File ) )
{
println Global script variable not defined: basedir or not a File
svn commit: r1506772 - in /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader: DefaultDownloader.java DownloadException.java DownloadNotFoundException.java Downloader
Author: dennisl Date: Wed Jul 24 22:53:58 2013 New Revision: 1506772 URL: http://svn.apache.org/r1506772 Log: Add missing license headers. Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadException.java maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadNotFoundException.java maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1506772r1=1506771r2=1506772view=diff == --- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java (original) +++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java Wed Jul 24 22:53:58 2013 @@ -1,5 +1,24 @@ package org.apache.maven.shared.downloader; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.File; import java.util.List; Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadException.java?rev=1506772r1=1506771r2=1506772view=diff == --- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadException.java (original) +++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadException.java Wed Jul 24 22:53:58 2013 @@ -1,5 +1,24 @@ package org.apache.maven.shared.downloader; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /** * @author Jason van Zyl */ Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadNotFoundException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadNotFoundException.java?rev=1506772r1=1506771r2=1506772view=diff == --- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadNotFoundException.java (original) +++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DownloadNotFoundException.java Wed Jul 24 22:53:58 2013 @@ -1,5 +1,24 @@ package org.apache.maven.shared.downloader; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless
svn commit: r1506160 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 17:05:31 2013 New Revision: 1506160 URL: http://svn.apache.org/r1506160 Log: Next version will be 2.2.1. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506160r1=1506159r2=1506160view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 17:05:31 2013 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-idea-plugin/artifactId - version2.3-SNAPSHOT/version + version2.2.1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven IDEA Plugin/name
svn commit: r1506163 - in /maven/plugins/trunk/maven-idea-plugin: pom.xml src/site/apt/index.apt src/site/apt/index.apt.vm src/site/site.xml
Author: dennisl
Date: Tue Jul 23 17:11:17 2013
New Revision: 1506163
URL: http://svn.apache.org/r1506163
Log:
Follow ASF branding rules.
Added:
maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
(contents, props changed)
- copied, changed from r1506159,
maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt
Removed:
maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt
Modified:
maven/plugins/trunk/maven-idea-plugin/pom.xml
maven/plugins/trunk/maven-idea-plugin/src/site/site.xml
Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506163r1=1506162r2=1506163view=diff
==
--- maven/plugins/trunk/maven-idea-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 17:11:17 2013
@@ -33,7 +33,7 @@ under the License.
version2.2.1-SNAPSHOT/version
packagingmaven-plugin/packaging
- nameMaven IDEA Plugin/name
+ nameApache Maven IDEA Plugin/name
descriptionGenerates project files for usage with IntelliJ IDEA from the
POM./description
prerequisites
Copied: maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm (from
r1506159, maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm?p2=maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vmp1=maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.aptr1=1506159r2=1506163rev=1506163view=diff
==
--- maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm Tue Jul 23
17:11:17 2013
@@ -3,7 +3,7 @@
--
Edwin Punzalan
--
- 05 July 2006
+ 2013-07-23
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
~~ under the License.
-Maven IDEA Plugin
+${project.name}
The IDEA Plugin is used to generate files (ipr, iml, and iws) for a project
so you can work on it using the IDE, IntelliJ IDEA.
Propchange: maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
--
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-idea-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/site/site.xml?rev=1506163r1=1506162r2=1506163view=diff
==
--- maven/plugins/trunk/maven-idea-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/site/site.xml Tue Jul 23 17:11:17
2013
@@ -21,8 +21,7 @@ under the License.
project xmlns=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;
- name=Maven Idea plugin
+ xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd;
body
menu name=Overview
item name=Introduction href=index.html/
svn commit: r1506168 - /maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
Author: dennisl
Date: Tue Jul 23 17:22:29 2013
New Revision: 1506168
URL: http://svn.apache.org/r1506168
Log:
Add a notice that this plugin is retired.
Modified:
maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm?rev=1506168r1=1506167r2=1506168view=diff
==
--- maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/site/apt/index.apt.vm Tue Jul 23
17:22:29 2013
@@ -26,6 +26,8 @@
${project.name}
+ Note: This plugin is retired. It is no longer maintained.
+
The IDEA Plugin is used to generate files (ipr, iml, and iws) for a project
so you can work on it using the IDE, IntelliJ IDEA.
svn commit: r1506174 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 17:35:35 2013 New Revision: 1506174 URL: http://svn.apache.org/r1506174 Log: Use latest version of maven-changes-plugin and fix its configuration so that we can fetch issues from JIRA. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506174r1=1506173r2=1506174view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 17:35:35 2013 @@ -134,12 +134,11 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-changes-plugin/artifactId -version2.0/version +version2.9/version configuration !-- For JIRA-report -- columnNamesType,Key,Summary,Assignee,Status,Resolution,Fix Version/columnNames onlyCurrentVersiontrue/onlyCurrentVersion - resolutionIdsClosed/resolutionIds sortColumnNamesType,Key/sortColumnNames /configuration reportSets
svn commit: r1506183 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 17:44:15 2013 New Revision: 1506183 URL: http://svn.apache.org/r1506183 Log: Use maven-javadoc-plugin:2.9.1 to avoid Javadoc vulnerability. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506183r1=1506182r2=1506183view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 17:44:15 2013 @@ -122,6 +122,11 @@ under the License. artifactIdmaven-compiler-plugin/artifactId version2.5.1/version /plugin +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-javadoc-plugin/artifactId + version2.9.1/version +/plugin /plugins /pluginManagement /build @@ -149,6 +154,11 @@ under the License. /reportSet /reportSets /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-javadoc-plugin/artifactId +version2.9.1/version + /plugin /plugins /reporting /profile
svn commit: r1506186 - /maven/pom/trunk/asf/pom.xml
Author: dennisl
Date: Tue Jul 23 17:49:02 2013
New Revision: 1506186
URL: http://svn.apache.org/r1506186
Log:
Use tarLongFileMode instead of tarLongFileFormat which has never worked for
maven-assembly-plugin.
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=1506186r1=1506185r2=1506186view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Tue Jul 23 17:49:02 2013
@@ -301,7 +301,7 @@ under the License.
descriptorRefs
descriptorRef${sourceReleaseAssemblyDescriptor}/descriptorRef
/descriptorRefs
- tarLongFileFormatgnu/tarLongFileFormat
+ tarLongFileModegnu/tarLongFileMode
/configuration
/execution
/executions
svn commit: r1506190 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 17:57:29 2013 New Revision: 1506190 URL: http://svn.apache.org/r1506190 Log: Add (RETIRED) to the name in the POM. This will propagate to the title and breadcrumb of every page in the generated site. Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506190r1=1506189r2=1506190view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 17:57:29 2013 @@ -33,7 +33,7 @@ under the License. version2.2.1-SNAPSHOT/version packagingmaven-plugin/packaging - nameApache Maven IDEA Plugin/name + nameApache Maven IDEA Plugin (RETIRED)/name descriptionGenerates project files for usage with IntelliJ IDEA from the POM./description prerequisites
svn commit: r1506191 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 18:02:01 2013 New Revision: 1506191 URL: http://svn.apache.org/r1506191 Log: [maven-release-plugin] prepare release maven-idea-plugin-2.2.1 Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506191r1=1506190r2=1506191view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 18:02:01 2013 @@ -19,7 +19,7 @@ specific language governing permissions under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion parent @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-idea-plugin/artifactId - version2.2.1-SNAPSHOT/version + version2.2.1/version packagingmaven-plugin/packaging nameApache Maven IDEA Plugin (RETIRED)/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2.1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-idea-plugin-2.2.1/url /scm issueManagement systemJIRA/system @@ -175,9 +175,9 @@ under the License. phaseintegration-test/phase configuration tasks -echo/echo/echo/echo/echo/ -echo level='warning'NO INTEGRATION TESTS DEFINED/echo -echo/echo/echo/echo/echo/ +echo /echo /echo /echo /echo / +echo level=warningNO INTEGRATION TESTS DEFINED/echo +echo /echo /echo /echo /echo / /tasks /configuration goals
svn commit: r1506194 - /maven/plugins/trunk/maven-idea-plugin/pom.xml
Author: dennisl Date: Tue Jul 23 18:02:15 2013 New Revision: 1506194 URL: http://svn.apache.org/r1506194 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml Modified: maven/plugins/trunk/maven-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin/pom.xml?rev=1506194r1=1506193r2=1506194view=diff == --- maven/plugins/trunk/maven-idea-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-idea-plugin/pom.xml Tue Jul 23 18:02:15 2013 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-idea-plugin/artifactId - version2.2.1/version + version2.2.2-SNAPSHOT/version packagingmaven-plugin/packaging nameApache Maven IDEA Plugin (RETIRED)/name @@ -41,9 +41,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-idea-plugin-2.2.1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-idea-plugin-2.2.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-idea-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1506193 - /maven/plugins/tags/maven-idea-plugin-2.2.1/
Author: dennisl Date: Tue Jul 23 18:02:11 2013 New Revision: 1506193 URL: http://svn.apache.org/r1506193 Log: [maven-release-plugin] copy for tag maven-idea-plugin-2.2.1 Added: maven/plugins/tags/maven-idea-plugin-2.2.1/ - copied from r1506191, maven/plugins/trunk/maven-idea-plugin/
svn commit: r870847 - /websites/production/maven/content/plugins-archives/maven-idea-plugin-2.2.1/
Author: dennisl Date: Tue Jul 23 18:13:17 2013 New Revision: 870847 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/plugins-archives/maven-idea-plugin-2.2.1 Added: websites/production/maven/content/plugins-archives/maven-idea-plugin-2.2.1/
