svn commit: r1382766 - /maven/plugins/trunk/maven-scm-publish-plugin/pom.xml
Author: olamy Date: Mon Sep 10 11:40:00 2012 New Revision: 1382766 URL: http://svn.apache.org/viewvc?rev=1382766view=rev Log: use released version Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/pom.xml?rev=1382766r1=1382765r2=1382766view=diff == --- maven/plugins/trunk/maven-scm-publish-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Mon Sep 10 11:40:00 2012 @@ -57,7 +57,7 @@ under the License. pluginTools3.1/pluginTools !-- for documentation purpose -- - maven-scm-provider-svnjava-version2.0.5-SNAPSHOT/maven-scm-provider-svnjava-version + maven-scm-provider-svnjava-version2.0.5/maven-scm-provider-svnjava-version svnkit-version1.7.5-v1/svnkit-version /properties
svn commit: r1382816 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
Author: olamy
Date: Mon Sep 10 13:09:57 2012
New Revision: 1382816
URL: http://svn.apache.org/viewvc?rev=1382816view=rev
Log:
[MECLIPSE-731] eclipse:clean not deleting ./settings folder that it creates.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=1382816r1=1382815r2=1382816view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
Mon Sep 10 13:09:57 2012
@@ -18,16 +18,16 @@
*/
package org.apache.maven.plugin.eclipse;
-import java.io.File;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import
org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
import org.apache.maven.plugin.ide.IdeUtils;
+import java.io.File;
+
/**
* Deletes the .project, .classpath, .wtpmodules files and .settings folder
used by Eclipse.
- *
+ *
* @goal clean
*/
public class EclipseCleanMojo
@@ -51,28 +51,28 @@ public class EclipseCleanMojo
/**
* Packaging for the current project.
- *
+ *
* @parameter expression=${project.packaging}
*/
private String packaging;
/**
* The root directory of the project
- *
+ *
* @parameter expression=${basedir}
*/
private File basedir;
/**
* Skip the operation when true.
- *
+ *
* @parameter expression=${eclipse.skip} default-value=false
*/
private boolean skip;
/**
* additional generic configuration files for eclipse
- *
+ *
* @parameter
*/
private EclipseConfigFile[] additionalConfig;
@@ -97,11 +97,7 @@ public class EclipseCleanMojo
delete( new File( basedir, FILE_DOT_CLASSPATH ) );
delete( new File( basedir, FILE_DOT_WTPMODULES ) );
-File settingsDir = new File( basedir,
EclipseWorkspaceWriter.DIR_DOT_SETTINGS );
-if ( settingsDir.exists() settingsDir.isDirectory()
settingsDir.list().length == 0 )
-{
-delete( settingsDir );
-}
+delete( new File( basedir, EclipseWorkspaceWriter.DIR_DOT_SETTINGS ) );
if ( additionalConfig != null )
{
@@ -122,7 +118,7 @@ public class EclipseCleanMojo
/**
* Delete a file, handling log messages and exceptions
- *
+ *
* @param f File to be deleted
* @throws MojoExecutionException only if a file exists and can't be
deleted
*/
@@ -134,7 +130,7 @@ public class EclipseCleanMojo
/**
* Getter for codebasedir/code.
- *
+ *
* @return Returns the basedir.
*/
public File getBasedir()
@@ -144,7 +140,7 @@ public class EclipseCleanMojo
/**
* Setter for codebasedir/code.
- *
+ *
* @param basedir The basedir to set.
*/
public void setBasedir( File basedir )
svn commit: r1382823 - /maven/plugins/trunk/maven-scm-publish-plugin/pom.xml
Author: olamy Date: Mon Sep 10 13:20:54 2012 New Revision: 1382823 URL: http://svn.apache.org/viewvc?rev=1382823view=rev Log: use last invoker plugin Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Modified: maven/plugins/trunk/maven-scm-publish-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/pom.xml?rev=1382823r1=1382822r2=1382823view=diff == --- maven/plugins/trunk/maven-scm-publish-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-scm-publish-plugin/pom.xml Mon Sep 10 13:20:54 2012 @@ -193,6 +193,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-invoker-plugin/artifactId +version1.7/version configuration addTestClassPathtrue/addTestClassPath /configuration
svn commit: r1382979 - /maven/doxia/trunks/
Author: olamy Date: Mon Sep 10 16:41:51 2012 New Revision: 1382979 URL: http://svn.apache.org/viewvc?rev=1382979view=rev Log: ignore .idea directory Modified: maven/doxia/trunks/ (props changed) Propchange: maven/doxia/trunks/ -- --- svn:ignore (original) +++ svn:ignore Mon Sep 10 16:41:51 2012 @@ -2,6 +2,7 @@ target *.iml *.ipr *.iws +.idea .classpath .project .settings
svn commit: r1382987 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
Author: olamy
Date: Mon Sep 10 17:09:35 2012
New Revision: 1382987
URL: http://svn.apache.org/viewvc?rev=1382987view=rev
Log:
[DOXIA-478] snippet macro fails if online: add a parameter to skip network
error.
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=1382987r1=1382986r2=1382987view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
Mon Sep 10 17:09:35 2012
@@ -24,41 +24,56 @@ import org.apache.maven.doxia.macro.Macr
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
/**
* A macro that prints out the content of a file or a URL.
*
* @version $Id$
*/
-@Component( role = Macro.class, hint = snippet )
+@Component (role = Macro.class, hint = snippet)
public class SnippetMacro
extends AbstractMacro
{
-/** Holds the cache. */
+/**
+ * Holds the cache.
+ */
private static MapString, String cache = new HashMapString, String();
private static final int HOUR = 60;
-/** One hour default cache. */
+/**
+ * One hour default cache.
+ */
private long timeout = HOUR * HOUR * 1000;
-/** Holds the time cache. */
+/**
+ * Holds the time cache.
+ */
private static MapString, Long timeCached = new HashMapString, Long();
-/** Debug. */
+/**
+ * Debug.
+ */
private boolean debug = false;
-/** {@inheritDoc} */
+/**
+ * in case of Exception during snippet download error will ignored and
empty content returned.
+ */
+private boolean ignoreDownloadError;
+
+/**
+ * {@inheritDoc}
+ */
public void execute( Sink sink, MacroRequest request )
throws MacroExecutionException
{
@@ -68,6 +83,20 @@ public class SnippetMacro
String fileParam = (String) request.getParameter( file );
+String debugParam = (String) request.getParameter( debug );
+
+if ( debugParam != null )
+{
+this.debug = Boolean.parseBoolean( debugParam );
+}
+
+String ignoreDownloadErrorParam = (String) request.getParameter(
ignoreDownloadError );
+
+if ( ignoreDownloadErrorParam != null )
+{
+this.ignoreDownloadError = Boolean.parseBoolean(
ignoreDownloadErrorParam );
+}
+
boolean verbatim = true;
String verbatimParam = (String) request.getParameter( verbatim );
@@ -142,7 +171,7 @@ public class SnippetMacro
* Return a snippet of the given url.
*
* @param url The URL to parse.
- * @param id The id of the snippet.
+ * @param id The id of the snippet.
* @return The snippet.
* @throws IOException if something goes wrong.
*/
@@ -164,14 +193,21 @@ public class SnippetMacro
}
else
{
-result = new SnippetReader( url ).readSnippet( id );
-
-cacheSnippet( url, id, result.toString() );
-
-if ( debug )
+try
+{
+result = new SnippetReader( url ).readSnippet( id );
+cacheSnippet( url, id, result.toString() );
+if ( debug )
+{
+result.append( (Fetched from url, cache content
).append( cache ).append( ) );
+}
+}
+catch ( IOException e )
{
-result.append( (Fetched from url, cache content ).append(
cache ).append( ) );
+result = new StringBuffer( Error during retrieving content
skip as ignoreDownloadError activated. );
}
+
+
}
return result;
@@ -181,7 +217,7 @@ public class SnippetMacro
* Return a snippet from the cache.
*
* @param url The URL to parse.
- * @param id The id of the snippet.
+ * @param id The id of the snippet.
*
svn commit: r1382994 - /maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm
Author: dennisl
Date: Mon Sep 10 17:32:03 2012
New Revision: 1382994
URL: http://svn.apache.org/viewvc?rev=1382994view=rev
Log:
[MCHANGES-285] SAXException parsing JIRA XML from JIRA 5.1
- Add more documentation.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm
Modified:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm?rev=1382994r1=1382993r2=1382994view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/customizing-jira-report.apt.vm
Mon Sep 10 17:32:03 2012
@@ -35,6 +35,35 @@ Customizing the JIRA Report
feature was added in which version.
+* What version of JIRA are you using?
+
+ Depending on which version of JIRA you use, you might need to add bits of
+ configuration to make the JIRA Report work properly. Starting with JIRA 5.1 it
+ is no longer possible to ask JIRA questions using query parameters. If you use
+ JIRA 5.1 or newer you must add this configuration, or else you will see a
+ stack trace saying something like Caused by: org.xml.sax.SAXParseException.
+
++-+
+project
+ ...
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changes-plugin/artifactId
+version${project.version}/version
+configuration
+ useJqltrue/useJql
+/configuration
+...
+ /plugin
+/plugins
+ /reporting
+ ...
+/project
++-+
+
+
* Selecting version(s)
We'll start off by creating a JIRA Report for one or more versions of your
svn commit: r1382996 - in /maven/plugins/trunk/maven-changes-plugin/src: main/java/org/apache/maven/plugin/jira/JiraMojo.java test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
Author: dennisl
Date: Mon Sep 10 17:34:32 2012
New Revision: 1382996
URL: http://svn.apache.org/viewvc?rev=1382996view=rev
Log:
[MCHANGES-267] Add ability to skip JIRA report creation
Submitted by: Joshua Hyde
Reviewed by: Dennis Lundberg
- I had to rework the parameter specification a bit, because the plugin had
moved to annotations after the patch was created.
Added:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
(with props)
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1382996r1=1382995r2=1382996view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
Mon Sep 10 17:34:32 2012
@@ -92,6 +92,7 @@ public class JiraMojo
/**
* Use the JIRA query language instead of the JIRA query based on HTTP
parameters.
* From JIRA 5.1 and up only JQL is supported. JIRA 4.4 supports both JQL
and URL parameter based queries.
+ *
* @since 2.8
*/
@Parameter( defaultValue = false )
@@ -198,6 +199,14 @@ public class JiraMojo
private Settings settings;
/**
+ * If set to codetrue/code, then the JIRA report will not be generated.
+ *
+ * @since 2.8
+ */
+@Parameter( property = changes.jira.skip, defaultValue = false )
+private boolean skip;
+
+/**
* Sets the column names that you want to sort the report by. Add
* codeDESC/code following the column name
* to specify idescending/i sequence. For
@@ -306,6 +315,10 @@ public class JiraMojo
*/
public boolean canGenerateReport()
{
+if ( skip )
+{
+return false;
+}
if ( mockDownloader != null )
{
return true;
Added:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java?rev=1382996view=auto
==
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
(added)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
Mon Sep 10 17:34:32 2012
@@ -0,0 +1,45 @@
+package org.apache.maven.plugin.jira;
+
+/*
+ * 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 org.apache.maven.plugin.testing.AbstractMojoTestCase;
+
+/**
+ * Unit tests for {@link JiraMojo}.
+ *
+ * @author jrh3k5
+ * @since 2.8
+ */
+
+public class JiraMojoTest extends AbstractMojoTestCase
+{
+private final JiraMojo mojo = new JiraMojo();
+
+/**
+ * If the mojo has been marked to be skipped, then it should indicate that
the report cannot be generated.
+ *
+ * @throws Exception If any errors occur during the test run.
+ */
+public void testCanGenerateReportSkipped() throws Exception
+{
+setVariableValueToObject( mojo, skip, Boolean.TRUE );
+assertFalse( mojo.canGenerateReport() );
+}
+}
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraMojoTest.java
--
svn:keywords = Date Revision Author Id
svn commit: r1383009 - in /maven/plugins/trunk/maven-changes-plugin/src/main/resources: github-report_de.properties github-report_fr.properties github-report_pt_BR.properties
Author: dennisl Date: Mon Sep 10 18:02:42 2012 New Revision: 1383009 URL: http://svn.apache.org/viewvc?rev=1383009view=rev Log: [MCHANGES-283] Add GitHub reporter - Add basic localizations for German, French and Brazilian Portuguese. I simple copied the properties from the JIRA Repost and substituted JIRA for GitHub and removed the unused keys. Added: maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties (contents, props changed) - copied, changed from r1382996, maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_fr.properties - copied, changed from r1382996, maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_fr.properties maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_pt_BR.properties - copied, changed from r1382996, maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_pt_BR.properties Copied: maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties (from r1382996, maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties?p2=maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.propertiesp1=maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.propertiesr1=1382996r2=1383009rev=1383009view=diff == --- maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_de.properties (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties Mon Sep 10 18:02:42 2012 @@ -15,20 +15,16 @@ # specific language governing permissions and limitations # under the License. -report.issues.name=JIRA-Bericht -report.issues.description=Bericht über die Probleme aus dem Problemverwaltungssystem JIRA. +report.issues.name=GitHub-Bericht +report.issues.description=Bericht über die Probleme aus dem Problemverwaltungssystem GitHub. report.issues.error=Es ist ein Fehler aufgetreten, der die Erstellung dieses Berichts unmöglich macht. \ Bitte werten Sie die Konsolenausgabe zur Feststellung der Ursache aus. -report.issues.header=JIRA-Bericht +report.issues.header=GitHub-Bericht report.issues.label.assignee=Durch -report.issues.label.component=Komponente report.issues.label.created=Erstellt report.issues.label.fixVersion=Korrigierte Version report.issues.label.id=# -report.issues.label.key=Schlüssel -report.issues.label.priority=Priorität report.issues.label.reporter=Reporter -report.issues.label.resolution=Lösung report.issues.label.status=Status report.issues.label.summary=Zusammenfassung report.issues.label.type=Typ Propchange: maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_de.properties -- svn:keywords = Date Revision Author Id Copied: maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_fr.properties (from r1382996, maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_fr.properties) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_fr.properties?p2=maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_fr.propertiesp1=maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_fr.propertiesr1=1382996r2=1383009rev=1383009view=diff == --- maven/plugins/trunk/maven-changes-plugin/src/main/resources/jira-report_fr.properties (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/github-report_fr.properties Mon Sep 10 18:02:42 2012 @@ -15,20 +15,16 @@ # specific language governing permissions and limitations # under the License. -report.issues.name=Rapport JIRA -report.issues.description=Rapport des demandes depuis le syst\u00EAme de gestion des demandes JIRA. +report.issues.name=Rapport GitHub +report.issues.description=Rapport des demandes depuis le syst\u00EAme de gestion des demandes GitHub. report.issues.error=Une erreur est survenue, ce qui ne permet pas de g\u00E9n\u00E9rer le rapport. \ Merci de v\u00E9rifier les traces dans la console pour conna\u00EEtre la cause de l'erreur. -report.issues.header=Rapport JIRA +report.issues.header=Rapport GitHub report.issues.label.assignee=Par -report.issues.label.component=Composant
svn commit: r1383078 - in /maven/plugins/trunk/maven-rar-plugin: pom.xml src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: olamy
Date: Mon Sep 10 19:40:15 2012
New Revision: 1383078
URL: http://svn.apache.org/viewvc?rev=1383078view=rev
Log:
[MRAR-29] Make ra.xml optional - 1.6 spec
Submitted by Kresimir Kovac.
Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1383078r1=1383077r2=1383078view=diff
==
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Mon Sep 10 19:40:15 2012
@@ -150,6 +150,7 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-invoker-plugin/artifactId
+ version1.7/version
configuration
debugtrue/debug
projectsDirectorysrc/it/projectsDirectory
Modified:
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1383078r1=1383077r2=1383078view=diff
==
---
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Mon Sep 10 19:40:15 2012
@@ -255,6 +255,17 @@ public class RarMojo
@Parameter
protected ListRarResource rarResources;
+
+/**
+ * Whether or not warn if the codera.xml/code file is missing. Set to
codefalse/code
+ * if you want you RAR built without a codera.xml/code file.
+ * This may be useful if you are building against JCA 1.6 or later.
+ *
+ * @since 2.3
+ */
+@Parameter( property = warnOnMissingRaXml, defaultValue = true )
+protected boolean warnOnMissingRaXml = true;
+
private File buildDir;
@@ -388,7 +399,7 @@ public class RarMojo
// Check if connector deployment descriptor is there
File ddFile = new File( getBuildDir(), RA_XML_URI );
-if ( !ddFile.exists() )
+if ( !ddFile.exists() warnOnMissingRaXml )
{
getLog().warn( Connector deployment descriptor: +
ddFile.getAbsolutePath() + does not exist. );
}
svn commit: r1383079 - /maven/plugins/trunk/maven-rar-plugin/pom.xml
Author: olamy Date: Mon Sep 10 19:40:25 2012 New Revision: 1383079 URL: http://svn.apache.org/viewvc?rev=1383079view=rev Log: add contributor Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1383079r1=1383078r2=1383079view=diff == --- maven/plugins/trunk/maven-rar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-rar-plugin/pom.xml Mon Sep 10 19:40:25 2012 @@ -50,6 +50,12 @@ under the License. systemJIRA/system urlhttp://jira.codehaus.org/browse/MRAR/url /issueManagement + + contributors +contributor + nameKresimir Kovac/name +/contributor + /contributors properties mavenVersion2.0.6/mavenVersion
svn commit: r1383080 - /maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: olamy Date: Mon Sep 10 19:40:40 2012 New Revision: 1383080 URL: http://svn.apache.org/viewvc?rev=1383080view=rev Log: [MRAR-32] Pass MavenSession to createArchive Submitted by Philippe Marschall. Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1383080r1=1383079r2=1383080view=diff == --- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Mon Sep 10 19:40:40 2012 @@ -415,7 +415,7 @@ public class RarMojo includeCustomManifestFile(); archiver.getArchiver().addDirectory( getBuildDir() ); -archiver.createArchive( project, archive ); +archiver.createArchive( session, project, archive ); project.getArtifact().setFile( rarFile ); }
svn commit: r1383081 - /maven/plugins/trunk/maven-rar-plugin/pom.xml
Author: olamy Date: Mon Sep 10 19:40:54 2012 New Revision: 1383081 URL: http://svn.apache.org/viewvc?rev=1383081view=rev Log: add contributor Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1383081r1=1383080r2=1383081view=diff == --- maven/plugins/trunk/maven-rar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-rar-plugin/pom.xml Mon Sep 10 19:40:54 2012 @@ -55,6 +55,9 @@ under the License. contributor nameKresimir Kovac/name /contributor +contributor + namePhilippe Marschall/name +/contributor /contributors properties
svn commit: r1383095 - /maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Author: hboutemy
Date: Mon Sep 10 20:10:06 2012
New Revision: 1383095
URL: http://svn.apache.org/viewvc?rev=1383095view=rev
Log:
formatting
Modified:
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Modified:
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1383095r1=1383094r2=1383095view=diff
==
---
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
(original)
+++
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Mon Sep 10 20:10:06 2012
@@ -1,5 +1,24 @@
package org.apache.maven.plugins.scmpublish;
+/*
+ * 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 org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.NameFileFilter;
@@ -27,38 +46,19 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-/*
- * 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.
- */
-
/**
* Publish a content to scm in one step. By default, content is taken from
default site staging directory
* code${project.build.directory}/staging/code.
* Can be used without project, so usable to update any SCM with any content.
*/
-@Mojo(name = publish-scm, aggregator = true, requiresProject = false)
+@Mojo( name = publish-scm, aggregator = true, requiresProject = false )
public class ScmPublishPublishScmMojo
extends ScmPublishPublishMojo
{
/**
* The content to be published.
*/
-@Parameter(property = scmpublish.content, defaultValue =
${project.build.directory}/staging)
+@Parameter( property = scmpublish.content, defaultValue =
${project.build.directory}/staging )
private File content;
/**
svn commit: r1383109 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/it/script-verify-xml/ src/it/script-verify-xml/src/ src/it/script-verify-xml/src/it/ src/it/script-verify-xml/src/it/minvoke
Author: rfscholte Date: Mon Sep 10 20:59:49 2012 New Revision: 1383109 URL: http://svn.apache.org/viewvc?rev=1383109view=rev Log: Fix MINVOKER-138: Use groovy-all dependency to have xml support Added: maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/verify.groovy Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1383109r1=1383108r2=1383109view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Mon Sep 10 20:59:49 2012 @@ -61,7 +61,7 @@ under the License. beanshell-artifactIdbsh/beanshell-artifactId beanshell-version2.0b4/beanshell-version groovy-groupIdorg.codehaus.groovy/groovy-groupId -groovy-artifactIdgroovy/groovy-artifactId +groovy-artifactIdgroovy-all/groovy-artifactId groovy-version2.0.1/groovy-version mavenPluginPluginVersion3.1/mavenPluginPluginVersion /properties Added: maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/pom.xml?rev=1383109view=auto == --- maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/pom.xml (added) +++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/pom.xml Mon Sep 10 20:59:49 2012 @@ -0,0 +1,61 @@ +?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; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.plugins.invoker.its/groupId + artifactIdscript-verify-xml/artifactId + version1.0-SNAPSHOT/version + packagingpom/packaging + + descriptionTest if the XmlSlurper is still on the classpath./description + + properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + /properties + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-invoker-plugin/artifactId +version@project.version@/version +configuration + debugtrue/debug + goals +goalvalidate/goal + /goals +/configuration +executions + execution +idintegration-test/id +phaseinitialize/phase +goals + goalverify/goal +/goals + /execution +/executions + /plugin +/plugins + /build + +/project Added: maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/pom.xml?rev=1383109view=auto == --- maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/pom.xml (added) +++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-verify-xml/src/it/minvoker-138/pom.xml Mon Sep 10 20:59:49 2012 @@ -0,0 +1,32 @@ +?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
svn commit: r1383143 - /maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml
Author: struberg Date: Mon Sep 10 22:48:42 2012 New Revision: 1383143 URL: http://svn.apache.org/viewvc?rev=1383143view=rev Log: MCOMPILER-21 add documentation for IT Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml?rev=1383143r1=1383142r2=1383143view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-21_methodname-change/pom.xml Mon Sep 10 22:48:42 2012 @@ -7,6 +7,12 @@ artifactIdmcompiler-21/artifactId version1.0-SNAPSHOT/version + description +This IT tests what happens if the method name in a single class BeanA gets changed. +In this case 'mvn compile' (without a clean) should fail as BeanA2 +still uses the old method of BeanA. + /description + build pluginManagement plugins @@ -40,4 +46,4 @@ /plugin /plugins /build -/project \ No newline at end of file +/project
