svn commit: r833678 - /maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Author: bentmann
Date: Sat Nov 7 14:02:13 2009
New Revision: 833678
URL: http://svn.apache.org/viewvc?rev=833678view=rev
Log:
o Fixed packaging detection (packaging is case-sensitive)
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=833678r1=833677r2=833678view=diff
==
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Sat Nov 7 14:02:13 2009
@@ -564,7 +564,7 @@
*/
public static boolean isPomPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( pom );
+return pom.equals( mavenProject.getPackaging() );
}
/**
@@ -575,7 +575,7 @@
*/
public static boolean isJarPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( jar )
+return jar.equals( mavenProject.getPackaging() )
|| isEjbPackaging( mavenProject )
|| isMavenPluginPackaging( mavenProject )
|| isBundlePackaging( mavenProject )
@@ -588,7 +588,7 @@
*/
public static boolean isBundlePackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( bundle );
+return bundle.equals( mavenProject.getPackaging() );
}
/**
@@ -597,7 +597,7 @@
*/
public static boolean isEjbPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( ejb );
+return ejb.equals( mavenProject.getPackaging() );
}
/**
@@ -606,7 +606,7 @@
*/
public static boolean isMavenPluginPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals(
maven-plugin );
+return maven-plugin.equals( mavenProject.getPackaging() );
}
/**
@@ -615,7 +615,7 @@
*/
public static boolean isEarPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( ear );
+return ear.equals( mavenProject.getPackaging() );
}
/**
@@ -624,7 +624,7 @@
*/
public static boolean isWarPackaging( MavenProject mavenProject )
{
-return mavenProject.getPackaging().toLowerCase().equals( war );
+return war.equals( mavenProject.getPackaging() );
}
/**
svn commit: r833679 - in /maven/plugins/trunk/maven-ant-plugin: pom.xml src/main/assembly/
Author: bentmann Date: Sat Nov 7 14:13:51 2009 New Revision: 833679 URL: http://svn.apache.org/viewvc?rev=833679view=rev Log: o Inherited from maven-plugins:16 o Removed custom source-release assembly descriptor Removed: maven/plugins/trunk/maven-ant-plugin/src/main/assembly/ Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=833679r1=833678r2=833679view=diff == --- maven/plugins/trunk/maven-ant-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ant-plugin/pom.xml Sat Nov 7 14:13:51 2009 @@ -25,7 +25,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version14/version +version16/version /parent artifactIdmaven-ant-plugin/artifactId @@ -177,30 +177,5 @@ /plugins /build /profile -profile - idrelease/id - build -plugins - plugin -artifactIdmaven-assembly-plugin/artifactId -executions - execution -idmake-project-src-distro/id -phasepackage/phase -goals - goalsingle/goal -/goals -configuration - descriptors -descriptorsrc/main/assembly/src.xml/descriptor - /descriptors - tarLongFileModegnu/tarLongFileMode -/configuration - /execution -/executions - /plugin -/plugins - /build -/profile /profiles /project
svn commit: r833683 - /maven/plugins/tags/maven-ant-plugin-2.3/
Author: bentmann Date: Sat Nov 7 14:30:10 2009 New Revision: 833683 URL: http://svn.apache.org/viewvc?rev=833683view=rev Log: [maven-scm] copy for tag maven-ant-plugin-2.3 Added: maven/plugins/tags/maven-ant-plugin-2.3/ - copied from r833682, maven/plugins/trunk/maven-ant-plugin/
svn commit: r833684 - /maven/plugins/trunk/maven-ant-plugin/pom.xml
Author: bentmann Date: Sat Nov 7 14:30:24 2009 New Revision: 833684 URL: http://svn.apache.org/viewvc?rev=833684view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=833684r1=833683r2=833684view=diff == --- maven/plugins/trunk/maven-ant-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ant-plugin/pom.xml Sat Nov 7 14:30:24 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-ant-plugin/artifactId - version2.3/version + version2.4-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Ant Plugin/name @@ -40,9 +40,9 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-ant-plugin-2.3/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin//url /scm issueManagement systemjira/system
svn commit: r833693 - /maven/maven-3/branches/MNG-XXXX/
Author: bentmann Date: Sat Nov 7 15:03:58 2009 New Revision: 833693 URL: http://svn.apache.org/viewvc?rev=833693view=rev Log: o Moved changes introduced in r833566 into feature branch Added: maven/maven-3/branches/MNG-/ (props changed) - copied from r833566, maven/maven-3/trunk/ Propchange: maven/maven-3/branches/MNG-/ -- bugtraq:append = true Propchange: maven/maven-3/branches/MNG-/ -- bugtraq:label = Enter issue ID: Propchange: maven/maven-3/branches/MNG-/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/maven-3/branches/MNG-/ -- bugtraq:number = false Propchange: maven/maven-3/branches/MNG-/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/maven-3/branches/MNG-/ -- --- svn:ignore (added) +++ svn:ignore Sat Nov 7 15:03:58 2009 @@ -0,0 +1,14 @@ +release.properties +deleteme.version.properties +bootstrap +target +.classpath +.project +.settings +*.iml +*.iws +*.ipr +log.txt +dependencies.xml +.git +.gitignore Propchange: maven/maven-3/branches/MNG-/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Nov 7 15:03:58 2009 @@ -0,0 +1,8 @@ +/maven/components/branches/MNG-3932-1:746145-746157 +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817 +/maven/components/branches/sisbell-plugin-manager:738973-739966 +/maven/components/sisbell-plugin-manager:738757-738972 +/maven/components/trunk:751453-767358,767708-768832 +/maven/maven-2/branches/maven-2.2.x:795521 Propchange: maven/maven-3/branches/MNG-/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
svn commit: r833697 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven: execution/MavenSession.java lifecycle/DefaultLifecycleExecutor.java
Author: bentmann
Date: Sat Nov 7 15:11:27 2009
New Revision: 833697
URL: http://svn.apache.org/viewvc?rev=833697view=rev
Log:
o Reverted changes introduced in r833566 due to IT failuree
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=833697r1=833696r2=833697view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Sat Nov 7 15:11:27 2009
@@ -43,7 +43,7 @@
* @author Jason van Zyl
* @version $Id$
*/
-public class MavenSession implements Cloneable
+public class MavenSession
{
private PlexusContainer container;
@@ -318,11 +318,6 @@
{
this.projectDependencyGraph = projectDependencyGraph;
}
-
-public ProjectDependencyGraph getProjectDependencyGraph()
-{
-return projectDependencyGraph;
-}
public String getReactorFailureBehavior()
{
@@ -366,27 +361,4 @@
return request.getStartTime();
}
-@Override
-public MavenSession clone()
-{
-try
-{
-return (MavenSession) super.clone();
-}
-catch ( CloneNotSupportedException e )
-{
-throw new RuntimeException(Bug, e);
-}
-}
-
-public void merge( MavenSession session )
-{
-if ( session.blackListedProjects != null )
-{
-for ( String projectId : session.blackListedProjects )
-{
-blackListedProjects.add( projectId );
-}
-}
-}
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=833697r1=833696r2=833697view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Sat Nov 7 15:11:27 2009
@@ -31,12 +31,6 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import org.apache.maven.ProjectDependenciesResolver;
import org.apache.maven.artifact.Artifact;
@@ -54,12 +48,10 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
-import org.apache.maven.plugin.BuildPluginManager;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -67,6 +59,7 @@
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
+import org.apache.maven.plugin.BuildPluginManager;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
@@ -259,242 +252,116 @@
}
ClassLoader oldContextClassLoader =
Thread.currentThread().getContextClassLoader();
-
-HashMapMavenProject, ProjectBuild projectBuildMap = new
HashMapMavenProject, ProjectBuild();
-for (ProjectBuild projectBuild : projectBuilds ) {
-projectBuildMap.put( projectBuild.project, projectBuild );
-}
-ProjectDependencyGraph pdg = session.getProjectDependencyGraph();
-
-int threadCount = 1;
-String threadCountProperty = (String) session.getUserProperties().get(
maven.threads.experimental );
-if (threadCountProperty != null) {
-try {
-threadCount = Integer.parseInt( threadCountProperty );
-
svn commit: r833706 - /maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java
Author: bentmann
Date: Sat Nov 7 16:28:51 2009
New Revision: 833706
URL: http://svn.apache.org/viewvc?rev=833706view=rev
Log:
o Restored compat with Java 1.5
Modified:
maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java
Modified:
maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java?rev=833706r1=833705r2=833706view=diff
==
---
maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java
(original)
+++
maven/sandbox/trunk/maven/maven-plugin-enforcer/src/main/java/org/apache/maven/util/pluginenforcer/PluginEnforcingMavenLifecycleParticipant.java
Sat Nov 7 16:28:51 2009
@@ -58,7 +58,7 @@
logger.info( StringUtils.repeat( -, 72 ) );
for ( String forcePlugin : config.split( , ) )
{
-if ( forcePlugin.isEmpty() )
+if ( StringUtils.isEmpty( forcePlugin ) )
{
continue;
}
svn commit: r833707 - /maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml
Author: bentmann Date: Sat Nov 7 16:29:57 2009 New Revision: 833707 URL: http://svn.apache.org/viewvc?rev=833707view=rev Log: o Polished POM Modified: maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml Modified: maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml?rev=833707r1=833706r2=833707view=diff == --- maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml (original) +++ maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml Sat Nov 7 16:29:57 2009 @@ -25,7 +25,11 @@ version3.0-SNAPSHOT/version nameApache Maven 3.x Plugin Enforcer/name - inceptionYear2001/inceptionYear + description +A build extension that allows to enforce specific versions for build plugins. The primary purpose is to easily +test new plugin versions without actually changing the POMs. + /description + inceptionYear2009/inceptionYear scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/sandbox/trunk/maven/maven-plugin-enforcer/connection @@ -43,15 +47,6 @@ /releases /repository /repositories - pluginRepositories -pluginRepository - idsonatype.public/id - urlhttp://repository.sonatype.org/content/repositories/plexus-oss-snapshots/url - releases -enabledfalse/enabled - /releases -/pluginRepository - /pluginRepositories dependencies dependency @@ -66,14 +61,13 @@ scopetest/scope /dependency /dependencies - !--bootstrap-end-comment-- build plugins plugin groupIdorg.codehaus.plexus/groupId artifactIdplexus-component-metadata/artifactId -version1.4.1/version +version1.5.0/version executions execution goals
svn commit: r833712 - in /maven/plugins/trunk: maven-changelog-plugin/pom.xml maven-changes-plugin/pom.xml maven-checkstyle-plugin/pom.xml maven-javadoc-plugin/pom.xml maven-pmd-plugin/pom.xml
Author: bentmann
Date: Sat Nov 7 16:50:50 2009
New Revision: 833712
URL: http://svn.apache.org/viewvc?rev=833712view=rev
Log:
o Fixed POM problems
Modified:
maven/plugins/trunk/maven-changelog-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?rev=833712r1=833711r2=833712view=diff
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Sat Nov 7 16:50:50 2009
@@ -360,7 +360,7 @@
Use the current version to generate sample with the last
features/fixes of the plugin.
It implies that the current version is already deployed to
generate the site.
--
-version${pom.version}/version
+version${project.version}/version
/plugin
/plugins
/reporting
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=833712r1=833711r2=833712view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sat Nov 7 16:50:50 2009
@@ -446,7 +446,7 @@
Use the current version to generate sample with the last
features/fixes of the plugin.
It implies that the current version is already deployed to
generate the site.
--
-version${pom.version}/version
+version${project.version}/version
configuration
!-- For Announcement --
generateJiraAnnouncementtrue/generateJiraAnnouncement
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=833712r1=833711r2=833712view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sat Nov 7 16:50:50 2009
@@ -278,7 +278,7 @@
Use the current version to generate sample with the last
features/fixes of the plugin.
It implies that the current version is already deployed to
generate the site.
--
-version${pom.version}/version
+version${project.version}/version
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=833712r1=833711r2=833712view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Nov 7 16:50:50 2009
@@ -339,6 +339,7 @@
!-- Backward compatibility with Maven 2.0.x --
plugin
artifactIdmaven-shade-plugin/artifactId
+version1.2.1/version
executions
execution
phasepackage/phase
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=833712r1=833711r2=833712view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Nov 7 16:50:50 2009
@@ -200,7 +200,7 @@
Use the current version to generate sample with the last
features/fixes of the plugin.
It implies that the current version is already deployed to
generate the site.
--
-version${pom.version}/version
+version${project.version}/version
/plugin
/plugins
/reporting
svn commit: r833724 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven: DefaultMaven.java InternalErrorException.java
Author: bentmann
Date: Sat Nov 7 17:51:36 2009
New Revision: 833724
URL: http://svn.apache.org/viewvc?rev=833724view=rev
Log:
o Tweaked error reporting
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
(with props)
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=833724r1=833723r2=833724view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Sat Nov 7 17:51:36 2009
@@ -109,6 +109,12 @@
{
result = processResult( new DefaultMavenExecutionResult(), e );
}
+catch ( RuntimeException e )
+{
+result =
+processResult( new DefaultMavenExecutionResult(),
+ new InternalErrorException( Internal error:
+ e, e ) );
+}
return result;
}
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java?rev=833724view=auto
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
(added)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
Sat Nov 7 17:51:36 2009
@@ -0,0 +1,36 @@
+package org.apache.maven;
+
+/*
+ * 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.
+ */
+
+/**
+ * Signals an internal error in Maven itself, e.g. a programming bug.
+ *
+ * @author Benjamin Bentmann
+ */
+public class InternalErrorException
+extends MavenExecutionException
+{
+
+public InternalErrorException( String message, Throwable cause )
+{
+super( message, cause );
+}
+
+}
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
--
svn:eol-style = native
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
--
svn:keywords = Author Date Id Revision
svn commit: r833729 - in /maven/archetype/trunk: archetype-common/pom.xml archetype-plugin/pom.xml
Author: bentmann Date: Sat Nov 7 18:33:13 2009 New Revision: 833729 URL: http://svn.apache.org/viewvc?rev=833729view=rev Log: o Fixed POMs Modified: maven/archetype/trunk/archetype-common/pom.xml maven/archetype/trunk/archetype-plugin/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=833729r1=833728r2=833729view=diff == --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Sat Nov 7 18:33:13 2009 @@ -66,10 +66,6 @@ artifactIdvelocity/artifactId /dependency dependency - groupIddom4j/groupId - artifactIddom4j/artifactId -/dependency -dependency groupIdcommons-collections/groupId artifactIdcommons-collections/artifactId /dependency Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=833729r1=833728r2=833729view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sat Nov 7 18:33:13 2009 @@ -66,11 +66,6 @@ artifactIdcommons-collections/artifactId version3.2.1/version /dependency -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-utils/artifactId - version1.5.8/version -/dependency /dependencies properties
svn commit: r833734 - in /maven/archetype/trunk: archetype-common/pom.xml archetype-packaging/pom.xml archetype-plugin/pom.xml archetype-testing/archetype-proxy/pom.xml archetype-testing/archetype-rep
Author: bentmann Date: Sat Nov 7 19:03:48 2009 New Revision: 833734 URL: http://svn.apache.org/viewvc?rev=833734view=rev Log: o Downgraded project version to 2.0-alpha-5-SNAPSHOT as the release of 2.0-alpha-5 failed (http://www.mail-archive.com/d...@maven.apache.org/msg80545.html) Modified: maven/archetype/trunk/archetype-common/pom.xml maven/archetype/trunk/archetype-packaging/pom.xml maven/archetype/trunk/archetype-plugin/pom.xml maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml maven/archetype/trunk/archetype-testing/pom.xml maven/archetype/trunk/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Sat Nov 7 19:03:48 2009 @@ -6,7 +6,7 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent artifactIdarchetype-common/artifactId nameMaven Archetype Common/name Modified: maven/archetype/trunk/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-packaging/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-packaging/pom.xml (original) +++ maven/archetype/trunk/archetype-packaging/pom.xml Sat Nov 7 19:03:48 2009 @@ -5,7 +5,7 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent artifactIdarchetype-packaging/artifactId Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sat Nov 7 19:03:48 2009 @@ -6,7 +6,7 @@ parent groupIdorg.apache.maven.archetype/groupId artifactIdmaven-archetype/artifactId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent !-- @@ -36,7 +36,7 @@ dependency groupIdorg.apache.maven.archetype/groupId artifactIdarchetype-common/artifactId - version2.0-alpha-6-SNAPSHOT/version + version2.0-alpha-5-SNAPSHOT/version /dependency dependency groupIdorg.codehaus.plexus/groupId Modified: maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml (original) +++ maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml Sat Nov 7 19:03:48 2009 @@ -5,7 +5,7 @@ parent artifactIdarchetype-testing/artifactId groupIdorg.apache.maven.archetype/groupId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent artifactIdarchetype-proxy/artifactId Modified: maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml (original) +++ maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml Sat Nov 7 19:03:48 2009 @@ -5,7 +5,7 @@ parent artifactIdarchetype-testing/artifactId groupIdorg.apache.maven.archetype/groupId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent artifactIdarchetype-repository/artifactId Modified: maven/archetype/trunk/archetype-testing/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/pom.xml?rev=833734r1=833733r2=833734view=diff == --- maven/archetype/trunk/archetype-testing/pom.xml (original) +++ maven/archetype/trunk/archetype-testing/pom.xml Sat Nov 7 19:03:48 2009 @@ -5,7 +5,7 @@ parent artifactIdmaven-archetype/artifactId groupIdorg.apache.maven.archetype/groupId -version2.0-alpha-6-SNAPSHOT/version +version2.0-alpha-5-SNAPSHOT/version /parent
svn commit: r833754 - in /maven/archetype/trunk: archetype-common/pom.xml archetype-packaging/pom.xml archetype-plugin/pom.xml archetype-testing/archetype-proxy/pom.xml archetype-testing/archetype-rep
Author: bentmann Date: Sat Nov 7 20:28:22 2009 New Revision: 833754 URL: http://svn.apache.org/viewvc?rev=833754view=rev Log: o Added license header Modified: maven/archetype/trunk/archetype-common/pom.xml maven/archetype/trunk/archetype-packaging/pom.xml maven/archetype/trunk/archetype-plugin/pom.xml maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml maven/archetype/trunk/archetype-testing/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=833754r1=833753r2=833754view=diff == --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Sat Nov 7 20:28:22 2009 @@ -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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion Modified: maven/archetype/trunk/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-packaging/pom.xml?rev=833754r1=833753r2=833754view=diff == --- maven/archetype/trunk/archetype-packaging/pom.xml (original) +++ maven/archetype/trunk/archetype-packaging/pom.xml Sat Nov 7 20:28:22 2009 @@ -1,3 +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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=833754r1=833753r2=833754view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sat Nov 7 20:28:22 2009 @@ -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/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion Modified: maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml
svn commit: r833757 - in /maven/resources/trunk/apache-source-release-assembly-descriptor: ./ src/test/java/org/apache/its/ src/test/java/org/apache/its/util/
Author: bentmann Date: Sat Nov 7 20:36:10 2009 New Revision: 833757 URL: http://svn.apache.org/viewvc?rev=833757view=rev Log: o Added license header Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml?rev=833757r1=833756r2=833757view=diff == --- maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml (original) +++ maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml Sat Nov 7 20:36:10 2009 @@ -1,4 +1,25 @@ -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; +?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 Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java?rev=833757r1=833756r2=833757view=diff == --- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java (original) +++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java Sat Nov 7 20:36:10 2009 @@ -1,5 +1,24 @@ package org.apache.its; +/* + * 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 static org.apache.its.util.TestUtils.archivePathFromChild; import static org.apache.its.util.TestUtils.archivePathFromProject; import static org.apache.its.util.TestUtils.assertZipContents; Modified:
svn commit: r833768 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl Date: Sat Nov 7 21:20:18 2009 New Revision: 833768 URL: http://svn.apache.org/viewvc?rev=833768view=rev Log: o Update to maven-plugins parent 16. Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=833768r1=833767r2=833768view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sat Nov 7 21:20:18 2009 @@ -25,7 +25,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version14/version +version16/version /parent artifactIdmaven-changes-plugin/artifactId
