svn commit: r803811 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm: ClassRealmManagerDelegate.java DefaultClassRealmManager.java
Author: bentmann
Date: Thu Aug 13 09:03:07 2009
New Revision: 803811
URL: http://svn.apache.org/viewvc?rev=803811view=rev
Log:
[MNG-4296] allow core extensions configure new classrealms
Submitted by: Igor Fedorenko
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
(with props)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java?rev=803811view=auto
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
(added)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
Thu Aug 13 09:03:07 2009
@@ -0,0 +1,34 @@
+package org.apache.maven.classrealm;
+
+/*
+ * 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.codehaus.plexus.classworlds.realm.ClassRealm;
+
+/**
+ * ClassRealmManagerDelegate is used to perform addition configuration of
+ * class realms created by ClassRealmManager.
+ *
+ * @author igor
+ */
+public interface ClassRealmManagerDelegate
+{
+void setupRealm( ClassRealm classRealm );
+}
Propchange:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
--
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java?rev=803811r1=803810r2=803811view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
Thu Aug 13 09:03:07 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.Collections;
+import java.util.List;
import java.util.Random;
import org.apache.maven.artifact.ArtifactUtils;
@@ -31,6 +33,7 @@
import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
/**
@@ -93,6 +96,11 @@
importMavenApi( classRealm );
+for ( ClassRealmManagerDelegate delegate : getDelegates() )
+{
+delegate.setupRealm( classRealm );
+}
+
return classRealm;
}
}
@@ -178,4 +186,16 @@
return plugin + plugin.getGroupId() + : + plugin.getArtifactId()
+ : + version;
}
+private ListClassRealmManagerDelegate getDelegates()
+{
+try
+{
+return container.lookupList( ClassRealmManagerDelegate.class );
+}
+catch ( ComponentLookupException e )
+{
+return Collections.emptyList();
+}
+}
+
}
svn commit: r803812 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: vsiveton
Date: Thu Aug 13 09:04:54 2009
New Revision: 803812
URL: http://svn.apache.org/viewvc?rev=803812view=rev
Log:
o added missing dep
Modified:
maven/plugins/trunk/maven-changelog-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=803812r1=803811r2=803812view=diff
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu Aug 13 09:04:54 2009
@@ -141,6 +141,11 @@
version${mavenVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-plugin-api/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
version${mavenVersion}/version
@@ -167,6 +172,16 @@
artifactIddoxia-sink-api/artifactId
version${doxiaVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-site-renderer/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-decoration-model/artifactId
+ version${doxiaVersion}/version
+/dependency
!-- scm --
dependency
@@ -231,6 +246,11 @@
/dependency
dependency
groupIdorg.apache.maven.scm/groupId
+ artifactIdmaven-scm-provider-svn-commons/artifactId
+ version${maven-scm.version}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.scm/groupId
artifactIdmaven-scm-provider-synergy/artifactId
version${maven-scm.version}/version
/dependency
@@ -247,8 +267,21 @@
version1.5.6/version
/dependency
+!-- misc --
+dependency
+ groupIdxml-apis/groupId
+ artifactIdxml-apis/artifactId
+ version1.0.b2/version
+/dependency
+
!-- test dependencies --
dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.2/version
+ scopetest/scope
+/dependency
+dependency
groupIdorg.apache.maven.plugin-testing/groupId
artifactIdmaven-plugin-testing-harness/artifactId
version1.2/version
svn commit: r803815 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: vsiveton
Date: Thu Aug 13 09:30:45 2009
New Revision: 803815
URL: http://svn.apache.org/viewvc?rev=803815view=rev
Log:
o added the current report in the reporting profile
Modified:
maven/plugins/trunk/maven-changelog-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=803815r1=803814r2=803815view=diff
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu Aug 13 09:30:45 2009
@@ -335,5 +335,21 @@
/plugins
/build
/profile
+profile
+ idreporting/id
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changelog-plugin/artifactId
+!--
+ 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
+ /plugin
+/plugins
+ /reporting
+/profile
/profiles
/project
svn propchange: r803450 - svn:log
Author: vsiveton Revision: 803450 Modified property: svn:log Modified: svn:log at Thu Aug 13 09:31:20 2009 -- --- svn:log (original) +++ svn:log Thu Aug 13 09:31:20 2009 @@ -1,5 +1,4 @@ MCHANGELOG-99: Invalid generated HTML reports -MCHANGELOG-100: Bump to Doxia 1.1.1 -o using latest doxia +o using doxia 1.0 o fix HTML renderer
svn commit: r803816 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project: DefaultProjectBuilder.java MavenProject.java
Author: bentmann
Date: Thu Aug 13 09:32:14 2009
New Revision: 803816
URL: http://svn.apache.org/viewvc?rev=803816view=rev
Log:
o Cleaned up code
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=803816r1=803815r2=803816view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Thu Aug 13 09:32:14 2009
@@ -87,8 +87,8 @@
return build( pomFile, true, configuration, false );
}
-private DefaultProjectBuildingResult build( File pomFile, boolean
localProject,
-ProjectBuildingRequest
configuration, boolean resolveDependencies )
+private ProjectBuildingResult build( File pomFile, boolean localProject,
ProjectBuildingRequest configuration,
+ boolean resolveDependencies )
throws ProjectBuildingException
{
ModelBuildingRequest request = getModelBuildingRequest( configuration,
null );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=803816r1=803815r2=803816view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Thu Aug 13 09:32:14 2009
@@ -17,8 +17,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
@@ -64,7 +62,7 @@
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.building.ModelUtils;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@@ -1840,27 +1838,9 @@
setScriptSourceRoots( ( new ArrayListString(
project.getScriptSourceRoots() ) ) );
}
-/*
- * TODO: This is temporary solution for the failure of IT mng-0471.
When StartForkedExecutionMojo clones the
- * project it really needs a deep copy of the model to make sure
manipulations to the project/model during the
- * forked execution don't pollute the main execution. It's not clear
to me right now whether manipulations to
- * the model itself should just be prohibited (say be means of
UnsupportedOperationExceptions) and only have the
- * project be mutable. If we allow model updates like in 2.x, the code
below should better be replaced with the
- * original cloning code from ModelUtils.
- */
if ( project.getModel() != null )
{
-try
-{
-StringWriter modelWriter = new StringWriter( 1024 * 10 );
-project.writeModel( modelWriter );
-MavenXpp3Reader parser = new MavenXpp3Reader();
-setModel( parser.read( new StringReader(
modelWriter.toString() ) ) );
-}
-catch ( Exception e )
-{
-throw new IllegalStateException( in-memory cloning failed, e
);
-}
+setModel( ModelUtils.cloneModel( project.getModel() ) );
}
if ( project.getOriginalModel() != null )
svn commit: r803828 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin: changes/ChangesReportGenerator.java jira/JiraReportGenerator.java trac/TracReportGenerator.jav
Author: vsiveton
Date: Thu Aug 13 10:11:17 2009
New Revision: 803828
URL: http://svn.apache.org/viewvc?rev=803828view=rev
Log:
MCHANGES-170: Review the Doxia Sink calls
o added missing sink calls for Doxia 1.0
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=803828r1=803827r2=803828view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Thu Aug 13 10:11:17 2009
@@ -134,7 +134,7 @@
/**
* Checks whether links to the issues can be generated.
- *
+ *
* @return codetrue/code if issue links can be generated,
codefalse/code otherwise.
*/
public boolean canGenerateIssueLinks( String system )
@@ -452,19 +452,21 @@
private void sinkSectionTitle1Anchor( Sink sink, String text, String
anchor )
{
sink.sectionTitle1();
-sink.anchor( anchor );
-sink.anchor_();
sink.text( text );
sink.sectionTitle1_();
+
+sink.anchor( anchor );
+sink.anchor_();
}
private void sinkSectionTitle2Anchor( Sink sink, String text, String
anchor )
{
sink.sectionTitle2();
-sink.anchor( anchor );
-sink.anchor_();
sink.text( text );
sink.sectionTitle2_();
+
+sink.anchor( anchor );
+sink.anchor_();
}
private void sinkShowTypeIcon( Sink sink, String type )
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java?rev=803828r1=803827r2=803828view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java
Thu Aug 13 10:11:17 2009
@@ -123,8 +123,12 @@
{
sinkBeginReport( sink, bundle );
+sink.paragraph();
+
sink.text( bundle.getString( report.jira.error ) );
+sink.paragraph_();
+
sinkEndReport( sink );
}
@@ -306,12 +310,15 @@
sink.body();
-sinkSectionTitle1( sink, bundle.getString( report.jira.header ) );
+sink.section1();
+sinkSectionTitle1( sink, bundle.getString( report.jira.header ) );
}
private void sinkEndReport( Sink sink )
{
+sink.section1_();
+
sink.body_();
sink.flush();
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java?rev=803828r1=803827r2=803828view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
Thu Aug 13 10:11:17 2009
@@ -28,7 +28,7 @@
/**
* Generates a Trac report.
- *
+ *
* @author Noriko Kinugasa
* @version $Id$
*/
@@ -44,8 +44,12 @@
{
sinkBeginReport( sink, bundle );
+sink.paragraph();
+
sink.text( bundle.getString( report.trac.error ) );
+sink.paragraph_();
+
sinkEndReport( sink );
}
@@ -154,12 +158,16 @@
sink.body();
+sink.section1();
+
sinkSectionTitle1( sink, bundle.getString( report.trac.header ) );
}
private void sinkEndReport( Sink sink )
{
+sink.section1_();
+
sink.body_();
sink.flush();
svn commit: r803829 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: vsiveton
Date: Thu Aug 13 10:12:50 2009
New Revision: 803829
URL: http://svn.apache.org/viewvc?rev=803829view=rev
Log:
o added missing dep
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=803829r1=803828r2=803829view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu Aug 13 10:12:50 2009
@@ -82,6 +82,16 @@
!-- maven --
dependency
groupIdorg.apache.maven/groupId
+ artifactIdmaven-core/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-artifact/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
version${mavenVersion}/version
/dependency
@@ -162,6 +172,21 @@
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-i18n/artifactId
+ version1.0-beta-7/version
+ exclusions
+exclusion
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-container-default/artifactId
+/exclusion
+exclusion
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-component-api/artifactId
+/exclusion
+ /exclusions
+/dependency
+dependency
+ groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
version1.5.8/version
/dependency
@@ -215,11 +240,21 @@
/dependency
dependency
groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-module-xhtml/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-sink-api/artifactId
version${doxiaVersion}/version
/dependency
dependency
groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-decoration-model/artifactId
+ version${doxiaSitetoolsVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-site-renderer/artifactId
version${doxiaSitetoolsVersion}/version
exclusions
@@ -267,12 +302,17 @@
!-- test dependencies --
dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.2/version
+ scopetest/scope
+/dependency
+dependency
groupIdorg.apache.maven.plugin-testing/groupId
artifactIdmaven-plugin-testing-harness/artifactId
version1.2/version
scopetest/scope
/dependency
-
/dependencies
build
svn commit: r803831 - in /maven/plugins/trunk/maven-changelog-plugin/src/main: java/org/apache/maven/plugin/changelog/ChangeLogReport.java resources/scm-activity.properties
Author: vsiveton Date: Thu Aug 13 10:16:56 2009 New Revision: 803831 URL: http://svn.apache.org/viewvc?rev=803831view=rev Log: o fixed i18n Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java maven/plugins/trunk/maven-changelog-plugin/src/main/resources/scm-activity.properties Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=803831r1=803830r2=803831view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java Thu Aug 13 10:16:56 2009 @@ -816,7 +816,7 @@ sink.sectionTitle1_(); sink.paragraph(); -sink.text( No sources found to create a report. ); +sink.text( bundle.getString( report.changelog.nosources ) ); sink.paragraph_(); sink.section1_(); Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/resources/scm-activity.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/resources/scm-activity.properties?rev=803831r1=803830r2=803831view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/main/resources/scm-activity.properties (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/main/resources/scm-activity.properties Thu Aug 13 10:16:56 2009 @@ -37,6 +37,7 @@ report.changelog.author=Author report.changelog.details=Details report.changelog.revision=Revision +report.changelog.nosources=No sources found to create a report. #Developer Activity report.dev-activity.name=Developer Activity
svn commit: r803832 - in /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog: ChangeLogReport.java DeveloperActivityReport.java
Author: vsiveton
Date: Thu Aug 13 10:23:26 2009
New Revision: 803832
URL: http://svn.apache.org/viewvc?rev=803832view=rev
Log:
o code readingness
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=803832r1=803831r2=803832view=diff
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Thu Aug 13 10:23:26 2009
@@ -1437,9 +1437,7 @@
{
return false;
}
-else
-{
-return true;
-}
+
+return true;
}
}
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java?rev=803832r1=803831r2=803832view=diff
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
Thu Aug 13 10:23:26 2009
@@ -201,12 +201,10 @@
{
continue;
}
-else
-{
-devCommits = (LinkedList) commits.get( id );
-devFiles = (HashMap) files.get( id );
-}
+devCommits = (LinkedList) commits.get( id );
+
+devFiles = (HashMap) files.get( id );
}
else
{
svn commit: r803833 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Author: vsiveton Date: Thu Aug 13 10:28:39 2009 New Revision: 803833 URL: http://svn.apache.org/viewvc?rev=803833view=rev Log: MCHECKSTYLE-119: Review the Doxia Sink calls o added missing sink calls for Doxia 1.0 Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?rev=803833r1=803832r2=803833view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Thu Aug 13 10:28:39 2009 @@ -140,6 +140,7 @@ doDetails( results ); sink.body_(); sink.flush(); +sink.close(); } private void doHeading() @@ -728,11 +729,12 @@ sink.section2(); sink.sectionTitle2(); -sink.anchor( file.replace( '/', '.' ) ); -sink.anchor_(); sink.text( file ); sink.sectionTitle2_(); +sink.anchor( file.replace( '/', '.' ) ); +sink.anchor_(); + sink.table(); sink.tableRow(); sink.tableHeaderCell();
svn commit: r803834 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
Author: vsiveton
Date: Thu Aug 13 10:32:13 2009
New Revision: 803834
URL: http://svn.apache.org/viewvc?rev=803834view=rev
Log:
o using log instead of stacktrace
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java?rev=803834r1=803833r2=803834view=diff
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
Thu Aug 13 10:32:13 2009
@@ -175,7 +175,14 @@
}
catch ( Exception e )
{
-e.printStackTrace();
+if ( getLog().isDebugEnabled() )
+{
+getLog().error( e.getMessage(), e );
+}
+else
+{
+getLog().error( e.getMessage() );
+}
sink.text( file.getName() );
}
svn commit: r803837 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Author: vsiveton
Date: Thu Aug 13 10:35:30 2009
New Revision: 803837
URL: http://svn.apache.org/viewvc?rev=803837view=rev
Log:
o replaced deprecated import
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=803837r1=803836r2=803837view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Thu Aug 13 10:35:30 2009
@@ -53,11 +53,11 @@
import org.codehaus.plexus.resource.loader.FileResourceLoader;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.PathTool;
-import org.codehaus.plexus.util.StringInputStream;
-import org.codehaus.plexus.util.StringOutputStream;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.velocity.VelocityComponent;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -525,7 +525,7 @@
private static final File[] EMPTY_FILE_ARRAY = new File[0];
-private StringOutputStream stringOutputStream;
+private ByteArrayOutputStream stringOutputStream;
/**
* @component
@@ -1100,7 +1100,7 @@
{
// Convert \ to \\, so that p.load will convert it back
properly
propertyExpansion = StringUtils.replace( propertyExpansion,
\\, );
-p.load( new StringInputStream( propertyExpansion ) );
+p.load( new ByteArrayInputStream( propertyExpansion.getBytes()
) );
}
// Workaround for MCHECKSTYLE-48
@@ -1255,7 +1255,7 @@
if ( useFile == null )
{
-stringOutputStream = new StringOutputStream();
+stringOutputStream = new ByteArrayOutputStream();
consoleListener = new DefaultLogger( stringOutputStream, false );
}
else
svn commit: r803843 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./ src/main/java/org/apache/maven/plugin/checkstyle/ src/test/java/org/apache/maven/plugin/checkstyle/
Author: vsiveton
Date: Thu Aug 13 11:10:31 2009
New Revision: 803843
URL: http://svn.apache.org/viewvc?rev=803843view=rev
Log:
MCHECKSTYLE-120: Bump to Doxia 1.0
o updated dependencies
o fixed test cases
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=803843r1=803842r2=803843view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Aug 13 11:10:31 2009
@@ -58,10 +58,12 @@
/issueManagement
properties
-mavenVersion2.0/mavenVersion
+mavenVersion2.0.6/mavenVersion
+doxiaVersion1.0/doxiaVersion
/properties
dependencies
+!-- maven --
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
@@ -90,13 +92,39 @@
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-impl/artifactId
- version2.0/version
+ version2.0.4.2/version
+/dependency
+
+!-- doxia --
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-sink-api/artifactId
+ version${doxiaVersion}/version
/dependency
dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-site-renderer/artifactId
+ version${doxiaVersion}/version
+ exclusions
+exclusion
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-component-api/artifactId
+/exclusion
+exclusion
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-container-default/artifactId
+/exclusion
+ /exclusions
+/dependency
+
+!-- shared --
+dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-doxia-tools/artifactId
- version1.0/version
+ version1.0.2/version
/dependency
+
+!-- plexus --
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-container-default/artifactId
@@ -115,19 +143,24 @@
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-velocity/artifactId
- version1.1.2/version
+ version1.1.7/version
exclusions
exclusion
- !-- Use the version specified by checkstyle:checkstyle instead --
- artifactIdcommons-collections/artifactId
- groupIdcommons-collections/groupId
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-container-default/artifactId
/exclusion
exclusion
- artifactIdplexus-utils/artifactId
- groupIdplexus/groupId
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-component-api/artifactId
+/exclusion
+exclusion
+ groupIdvelocity/groupId
+ artifactIdvelocity/artifactId
/exclusion
/exclusions
/dependency
+
+!-- checkstyle --
dependency
groupIdcheckstyle/groupId
artifactIdcheckstyle/artifactId
@@ -138,6 +171,26 @@
artifactIdcheckstyle-optional/artifactId
version4.4/version
/dependency
+
+!-- misc --
+dependency
+ groupIdorg.apache.velocity/groupId
+ artifactIdvelocity/artifactId
+ version1.5/version
+/dependency
+dependency
+ groupIdcommons-collections/groupId
+ artifactIdcommons-collections/artifactId
+ version3.2.1/version
+/dependency
+
+!-- test --
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.2/version
+ scopetest/scope
+/dependency
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-plugin-testing-harness/artifactId
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=803843r1=803842r2=803843view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Thu Aug 13 11:10:31 2009
@@ -34,6 +34,7 @@
import
svn commit: r803845 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/ test/java/org/apache/maven/plugin/checkstyle/ test/java/org/apache/maven/plugin
Author: vsiveton
Date: Thu Aug 13 11:18:04 2009
New Revision: 803845
URL: http://svn.apache.org/viewvc?rev=803845view=rev
Log:
o javadoc
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleResults.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MavenProjectWithExceptionsStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MinMavenProjectStub.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=803845r1=803844r2=803845view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Thu Aug 13 11:18:04 2009
@@ -84,6 +84,7 @@
* @author a href=mailto:eveni...@apache.org;Emmanuel Venisse/a
* @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a
* @author a href=mailto:joa...@erdfelt.com;Joakim Erdfelt/a
+ * @version $Id$
* @goal checkstyle
* @requiresDependencyResolution compile
*/
@@ -513,11 +514,7 @@
*/
private ServiceLocator serviceLocator;
-/**
- * ${inheritDoc}
- *
- * @see
org.codehaus.plexus.personality.plexus.lifecycle.phase.Serviceable#service(org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceLocator)
- */
+/** {...@inheritdoc} */
public void service( ServiceLocator locator )
{
this.serviceLocator = locator;
@@ -534,49 +531,37 @@
*/
private ResourceManager locator;
-/**
- * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
- */
+/** {...@inheritdoc} */
public String getName( Locale locale )
{
return getBundle( locale ).getString( report.checkstyle.name );
}
-/**
- * @see
org.apache.maven.reporting.MavenReport#getDescription(java.util.Locale)
- */
+/** {...@inheritdoc} */
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( report.checkstyle.description
);
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
- */
+/** {...@inheritdoc} */
protected String getOutputDirectory()
{
return outputDirectory.getAbsolutePath();
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getProject()
- */
+/** {...@inheritdoc} */
protected MavenProject getProject()
{
return project;
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
- */
+/** {...@inheritdoc} */
protected Renderer getSiteRenderer()
{
return siteRenderer;
}
-/**
- * @see
org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
- */
+/** {...@inheritdoc} */
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -991,9 +976,7 @@
return
svn commit: r803846 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: vsiveton
Date: Thu Aug 13 11:24:12 2009
New Revision: 803846
URL: http://svn.apache.org/viewvc?rev=803846view=rev
Log:
o order dep
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=803846r1=803845r2=803846view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Aug 13 11:24:12 2009
@@ -82,47 +82,38 @@
/issueManagement
properties
-maven.version2.0.9/maven.version
+mavenVersion2.0.9/mavenVersion
/properties
dependencies
+!-- maven --
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version${maven.version}/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version${maven.version}/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version${maven.version}/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version${maven.version}/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-core/artifactId
- version${maven.version}/version
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-plugin-testing-tools/artifactId
- version1.0-alpha-3/version
- scopetest/scope
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-plugin-testing-harness/artifactId
- scopetest/scope
- version1.1/version
+ version${mavenVersion}/version
/dependency
+
+!-- plexus --
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-archiver/artifactId
@@ -149,32 +140,11 @@
version1.1/version
/dependency
dependency
- groupIdjunit/groupId
- artifactIdjunit/artifactId
- version3.8.2/version
- scopetest/scope
-/dependency
-dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-container-default/artifactId
version1.0-alpha-9-stable-1/version
/dependency
dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-dependency-analyzer/artifactId
- version1.1/version
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-dependency-tree/artifactId
- version1.2/version
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-common-artifact-filters/artifactId
- version1.0/version
-/dependency
-dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-io/artifactId
version1.0-alpha-1/version
@@ -190,6 +160,23 @@
/exclusions
/dependency
+!-- shared --
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-dependency-analyzer/artifactId
+ version1.1/version
+/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-dependency-tree/artifactId
+ version1.2/version
+/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-common-artifact-filters/artifactId
+ version1.0/version
+/dependency
+
!-- Dependencies for Analyze-report mojo --
dependency
groupIdorg.apache.maven.reporting/groupId
@@ -201,6 +188,26 @@
artifactIdmaven-reporting-impl/artifactId
version2.0.4/version
/dependency
+
+!-- test --
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.2/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-plugin-testing-tools/artifactId
+ version1.0-alpha-3/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-plugin-testing-harness/artifactId
+ scopetest/scope
+ version1.1/version
+/dependency
/dependencies
build
svn commit: r803847 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
Author: vsiveton
Date: Thu Aug 13 11:36:45 2009
New Revision: 803847
URL: http://svn.apache.org/viewvc?rev=803847view=rev
Log:
MDEP-228: Review the Doxia Sink calls
o updated to Doxia 1.0
o fixed sink calls
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=803847r1=803846r2=803847view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Aug 13 11:36:45 2009
@@ -83,6 +83,7 @@
properties
mavenVersion2.0.9/mavenVersion
+doxiaVersion1.0/doxiaVersion
/properties
dependencies
@@ -112,6 +113,28 @@
artifactIdmaven-core/artifactId
version${mavenVersion}/version
/dependency
+dependency
+ groupIdorg.apache.maven.reporting/groupId
+ artifactIdmaven-reporting-api/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.reporting/groupId
+ artifactIdmaven-reporting-impl/artifactId
+ version2.0.4.2/version
+/dependency
+
+!-- doxia --
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-sink-api/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-site-renderer/artifactId
+ version${doxiaVersion}/version
+/dependency
!-- plexus --
dependency
@@ -177,18 +200,6 @@
version1.0/version
/dependency
-!-- Dependencies for Analyze-report mojo --
-dependency
- groupIdorg.apache.maven.reporting/groupId
- artifactIdmaven-reporting-api/artifactId
- version2.0.6/version
-/dependency
-dependency
- groupIdorg.apache.maven.reporting/groupId
- artifactIdmaven-reporting-impl/artifactId
- version2.0.4/version
-/dependency
-
!-- test --
dependency
groupIdjunit/groupId
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java?rev=803847r1=803846r2=803847view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
Thu Aug 13 11:36:45 2009
@@ -49,8 +49,6 @@
sink.sectionTitle1();
sink.text( bundle.getString( analyze.report.mainTitle ) );
sink.sectionTitle1_();
-sink.section1_();
-sink.lineBreak();
// Generate Used Declared dependencies:
sink.section2();
@@ -59,7 +57,9 @@
sink.sectionTitle2_();
if ( analysis.getUsedDeclaredArtifacts().isEmpty() )
{
+sink.paragraph();
sink.text( bundle.getString( analyze.report.noDependency ) );
+sink.paragraph_();
sink.horizontalRule();
}
else
@@ -76,7 +76,9 @@
sink.sectionTitle2_();
if ( analysis.getUsedUndeclaredArtifacts().isEmpty() )
{
+sink.paragraph();
sink.text( bundle.getString( analyze.report.noDependency ) );
+sink.paragraph_();
sink.horizontalRule();
}
else
@@ -93,7 +95,9 @@
sink.sectionTitle2_();
if ( analysis.getUnusedDeclaredArtifacts().isEmpty() )
{
+sink.paragraph();
sink.text( bundle.getString( analyze.report.noDependency ) );
+sink.paragraph_();
sink.horizontalRule();
}
else
@@ -103,6 +107,8 @@
}
sink.section2_();
+sink.section1_();
+
// Closing the report
sink.body_();
sink.flush();
svn commit: r803850 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/main/java/org/apache/maven/plugin/pmd/ src/test/java/org/apache/maven/plugin/pmd/
Author: vsiveton
Date: Thu Aug 13 11:57:24 2009
New Revision: 803850
URL: http://svn.apache.org/viewvc?rev=803850view=rev
Log:
MPMD-102: Bump to Doxia 1.0
o using doxia 1.0
o upgrade code
Added:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
(with props)
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=803850r1=803849r2=803850view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Thu Aug 13 11:57:24 2009
@@ -61,7 +61,8 @@
/issueManagement
properties
-mavenVersion2.0/mavenVersion
+mavenVersion2.0.6/mavenVersion
+doxiaVersion1.0/doxiaVersion
/properties
dependencies
@@ -89,7 +90,24 @@
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-impl/artifactId
- version${mavenVersion}/version
+ version2.0.4.2/version
+/dependency
+
+!-- doxia --
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-sink-api/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-decoration-model/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-site-renderer/artifactId
+ version${doxiaVersion}/version
/dependency
!-- plexus --
@@ -111,6 +129,13 @@
version4.2.4/version
/dependency
+!-- misc --
+dependency
+ groupIdxerces/groupId
+ artifactIdxmlParserAPIs/artifactId
+ version2.6.2/version
+/dependency
+
!-- test --
dependency
groupIdorg.apache.maven.shared/groupId
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=803850r1=803849r2=803850view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
Thu Aug 13 11:57:24 2009
@@ -32,10 +32,10 @@
import java.util.Map;
import java.util.TreeMap;
+import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
@@ -60,7 +60,7 @@
* The output directory for the final HTML report. Note that this
parameter is only evaluated if the goal is run
* directly from the command line or during the default lifecycle. If the
goal is run indirectly as part of a site
* generation, the output directory configured in the Maven Site Plugin is
used instead.
- *
+ *
* @parameter expression=${project.reporting.outputDirectory}
* @required
*/
@@ -71,7 +71,7 @@
*
* @component
*/
-private SiteRenderer siteRenderer;
+private Renderer siteRenderer;
/**
* The project to analyse.
@@ -106,7 +106,7 @@
* @parameter default-value=${project.reporting.outputDirectory}/xref
*/
private File xrefLocation;
-
+
/**
* Location of the Test Xrefs to link to.
*
@@ -119,21 +119,21 @@
* exclusion patterns only operate on the path of a source file relative
to its source root directory. In other
* words, files are excluded based on their package and/or class name. If
you want to exclude entire source root
* directories, use the parameter codeexcludeRoots/code instead.
- *
+ *
* @parameter
* @since 2.2
*/
private String[] excludes;
/**
svn commit: r803861 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: vsiveton
Date: Thu Aug 13 12:27:16 2009
New Revision: 803861
URL: http://svn.apache.org/viewvc?rev=803861view=rev
Log:
o added current pmd version in the reporting profile
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=803861r1=803860r2=803861view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Thu Aug 13 12:27:16 2009
@@ -151,14 +151,6 @@
/dependency
/dependencies
- reporting
-plugins
- plugin
-artifactIdmaven-changelog-plugin/artifactId
- /plugin
-/plugins
- /reporting
-
profiles
profile
idrun-its/id
@@ -196,5 +188,21 @@
/plugins
/build
/profile
+profile
+ idreporting/id
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-pmd-plugin/artifactId
+!--
+ 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
+ /plugin
+/plugins
+ /reporting
+/profile
/profiles
/project
svn commit: r803867 - /maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: vsiveton
Date: Thu Aug 13 12:48:58 2009
New Revision: 803867
URL: http://svn.apache.org/viewvc?rev=803867view=rev
Log:
MSHARED-119: Review the Doxia Sink calls
o fixed
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=803867r1=803866r2=803867view=diff
==
---
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Thu Aug 13 12:48:58 2009
@@ -113,9 +113,6 @@
{
section = section + 1;
-sink.anchor( HtmlTools.encodeId( name ) );
-sink.anchor_();
-
switch ( section )
{
case 1:
@@ -168,6 +165,9 @@
// TODO: warning - just don't start a section
break;
}
+
+sink.anchor( HtmlTools.encodeId( name ) );
+sink.anchor_();
}
/**
svn commit: r803890 - in /maven/repository-tools/trunk/src/bin/synchronize/m2-sync: disabled.csv sync.csv
Author: brianf Date: Thu Aug 13 14:03:58 2009 New Revision: 803890 URL: http://svn.apache.org/viewvc?rev=803890view=rev Log: disable healthmarket and xcluder Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv?rev=803890r1=803889r2=803890view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv Thu Aug 13 14:03:58 2009 @@ -1,2 +1,4 @@ net.liftweb,mavens...@scala-tools.org:/home/mavensync/repo-releases,rsync_ssh,David Bernard,,, org.amplecode,mavens...@login.amplecode.org:/var/www/amplecode/maven2,rsync_ssh,Lars Helge Oeverland,larshe...@gmail.com,, +gr.abiss.xcluder,mavens...@web.sourceforge.net:/home/groups/x/xc/xcluder/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, +com.healthmarketscience,ma...@open.hmsonline.com:/home/repo/html/maven2,rsync_ssh,,openhms-b...@lists.sourceforge.net,, \ No newline at end of file Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=803890r1=803889r2=803890view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Thu Aug 13 14:03:58 2009 @@ -30,7 +30,6 @@ com.googlecode.maven-overview-plugin,/home/maven/repository-staging/to-ibiblio/maven-svn,svn,Hubert Iwaniuk,neo...@kungfoo.pl,,http://kungfoo-m2.googlecode.com/svn/release-repo/; com.h2database,mavens...@web.sourceforge.net:/home/groups/h/hs/hsql/htdocs/m2-repo,rsync_ssh,Thomas Mueller,thomas.tom.muel...@gmail.com,, com.hazelcast,mavens...@web.sourceforge.net:/home/groups/h/ha/hazelcast/htdocs/m2repo,rsync_ssh,Talip Ozturk,ta...@hazelcast.com,, -com.healthmarketscience,ma...@open.hmsonline.com:/home/repo/html/maven2,rsync_ssh,,openhms-b...@lists.sourceforge.net,, com.hp.hpl.jena,mavens...@jena.hpl.hp.com:/var/repo,rsync_ssh,Andy Seaborne,andy.seabo...@hp.com,, com.ingres.jdbc,/home/maven/repository-staging/to-ibiblio/maven-svn,svn,Alan Raison,alan.rai...@ingres.com,,http://code.ingres.com/apps/maven com.jgoodies,mavens...@web.sourceforge.net:/home/groups/m/mv/mvnartifacts/htdocs/m2-repo,rsync_ssh,Roland Klein,pereg...@sourceforge.net,, @@ -80,8 +79,6 @@ gr.abiss.js.sarissa,mavens...@web.sourceforge.net:/home/groups/s/sa/sarissa/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, gr.abiss.md4j,mavens...@web.sourceforge.net:/home/groups/m/md/md4j/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, gr.abiss.mvn.plugins,mavens...@web.sourceforge.net:/home/groups/m/mv/mvn-jstools/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, -gr.abiss.xcluder,mavens...@web.sourceforge.net:/home/groups/x/xc/xcluder/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, -gr.abiss.xcluder,mavens...@web.sourceforge.net:/home/groups/x/xc/xcluder/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, gr.spinellis,mavens...@web.sourceforge.net:/home/groups/c/ck/ckjm/htdocs/m2repo,rsync_ssh,Nicolas Dordet,dorde...@gmail.com,, info.magnolia,mavens...@repo.magnolia-cms.com:synched-to-central,rsync_ssh,Gregory Joseph,gregory.jos...@magnolia-cms.com,, it.cnr.isti.domoware,maven-cent...@domoware.isti.cnr.it:/maven2,rsync_ssh,Stefano Lenzi,stefano.le...@isti.cnr.it,,
svn commit: r803895 - in /maven/repository-tools/trunk/src/bin/synchronize/m2-sync: disabled.csv sync.csv
Author: brianf Date: Thu Aug 13 14:08:03 2009 New Revision: 803895 URL: http://svn.apache.org/viewvc?rev=803895view=rev Log: disabled a few more. Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv?rev=803895r1=803894r2=803895view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv Thu Aug 13 14:08:03 2009 @@ -1,4 +1,7 @@ net.liftweb,mavens...@scala-tools.org:/home/mavensync/repo-releases,rsync_ssh,David Bernard,,, org.amplecode,mavens...@login.amplecode.org:/var/www/amplecode/maven2,rsync_ssh,Lars Helge Oeverland,larshe...@gmail.com,, gr.abiss.xcluder,mavens...@web.sourceforge.net:/home/groups/x/xc/xcluder/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, -com.healthmarketscience,ma...@open.hmsonline.com:/home/repo/html/maven2,rsync_ssh,,openhms-b...@lists.sourceforge.net,, \ No newline at end of file +com.healthmarketscience,ma...@open.hmsonline.com:/home/repo/html/maven2,rsync_ssh,,openhms-b...@lists.sourceforge.net,, +org.duraspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace Developers,dspace-de...@lists.sourceforge.net,, +org.fedora-commons,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace Developers,dspace-de...@lists.sourceforge.net,, +it.cnr.isti.domoware,maven-cent...@domoware.isti.cnr.it:/maven2,rsync_ssh,Stefano Lenzi,stefano.le...@isti.cnr.it,, \ No newline at end of file Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=803895r1=803894r2=803895view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Thu Aug 13 14:08:03 2009 @@ -81,7 +81,6 @@ gr.abiss.mvn.plugins,mavens...@web.sourceforge.net:/home/groups/m/mv/mvn-jstools/htdocs/repository/releases,rsync_ssh,Manos Batsis,mbat...@users.sourceforge.net,, gr.spinellis,mavens...@web.sourceforge.net:/home/groups/c/ck/ckjm/htdocs/m2repo,rsync_ssh,Nicolas Dordet,dorde...@gmail.com,, info.magnolia,mavens...@repo.magnolia-cms.com:synched-to-central,rsync_ssh,Gregory Joseph,gregory.jos...@magnolia-cms.com,, -it.cnr.isti.domoware,maven-cent...@domoware.isti.cnr.it:/maven2,rsync_ssh,Stefano Lenzi,stefano.le...@isti.cnr.it,, it.tidalwave.thesefoolishthings,/home/maven/repository-staging/to-ibiblio/maven-svn,svn,Fabrizio Giudici,fabrizio.giud...@tidalwave.it,,https://kenai.com/svn/tidalwave~maven-repo/release/2/; javassist,jvan...@people.apache.org:/home/nicolas/rsync-to-central,rsync_ssh,Nicolas De Loof,nico...@apache.org,, javax.portlet,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh @@ -225,12 +224,10 @@ org.drizzle.jdbc,mavens...@jdbc.drizzle.org:mavenrepo/releases,rsync_ssh,Marcus Eriksson,krum...@gmail.com,, org.dspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace Developers,dspace-de...@lists.sourceforge.net,, org.duineframework,mavens...@web.sourceforge.net:/home/groups/d/du/duine/htdocs/m2repo,rsync_ssh,Peter Fennema,peter.fenn...@telin.nl,, -org.duraspace,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace Developers,dspace-de...@lists.sourceforge.net,, org.easyb,ma...@easyb.org:/var/maven/repo/release,rsync_ssh,Rod Coffin,r...@rodcoffin.com,, org.easymock,mavens...@web.sourceforge.net:/home/groups/e/ea/easymock/htdocs/maven/repository,rsync_ssh,Henri Tremblay,henri.tremb...@gmail.com,, org.efaps,/home/maven/repository-staging/to-ibiblio/maven-svn,svn,Jan Moxter,jan.mox...@efaps.org,,http://efaps.googlecode.com/svn/repo/released/; org.extrema-sistemas.loom,mavens...@web.sourceforge.net:/home/groups/l/lo/loom/htdocs/repository,rsync_ssh,ignacio coloma,icol...@gmail.com,, -org.fedora-commons,mavens...@maven.dspace.org:/var/maven/release,rsync_ssh,DSpace Developers,dspace-de...@lists.sourceforge.net,, org.freecompany,rs...@www.freecompany.org:maven,rsync_ssh,Craig Blake,craigwbl...@freecompany.org,, org.freemarker,mavens...@web.sourceforge.net:/home/groups/f/fr/freemarker/htdocs/maven2,rsync_ssh,Daniel Dekany,ddek...@freemail.hu,, org.gamio,mavens...@web.sourceforge.net:/home/groups/g/ga/gamio/htdocs/m2repo,rsync_ssh,Agemo Cui,agemo...@gmail.com,,
svn commit: r803926 - /maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Author: hboutemy
Date: Thu Aug 13 15:17:20 2009
New Revision: 803926
URL: http://svn.apache.org/viewvc?rev=803926view=rev
Log:
fixed a typo
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java?rev=803926r1=803925r2=803926view=diff
==
---
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
(original)
+++
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Thu Aug 13 15:17:20 2009
@@ -374,7 +374,7 @@
// if the site was not already generated, invoke it
if ( documents == null || ( documents != null documents.size()
== 0 ) )
{
-getLog().info( Try to invoke the maven-site-plugin to be sure
that all files are generated... );
+getLog().info( Trying to invoke the maven-site-plugin to be
sure that all files are generated... );
try
{
svn commit: r803961 - in /maven/components/trunk/maven-core/src: main/java/org/apache/maven/project/ main/java/org/apache/maven/project/artifact/ test/java/org/apache/maven/project/
Author: bentmann
Date: Thu Aug 13 17:52:27 2009
New Revision: 803961
URL: http://svn.apache.org/viewvc?rev=803961view=rev
Log:
[MNG-4298] Build MavenProject instances incrementally
Submitted by: Igor Fedorenko
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=803961r1=803960r2=803961view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Thu Aug 13 17:52:27 2009
@@ -23,7 +23,6 @@
import org.apache.maven.Maven;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -84,67 +83,94 @@
public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest
configuration )
throws ProjectBuildingException
{
-return build( pomFile, true, configuration, false );
+return build( pomFile, true, configuration );
}
-private ProjectBuildingResult build( File pomFile, boolean localProject,
ProjectBuildingRequest configuration,
- boolean resolveDependencies )
+private ProjectBuildingResult build( File pomFile, boolean localProject,
ProjectBuildingRequest configuration )
throws ProjectBuildingException
{
-ModelBuildingRequest request = getModelBuildingRequest( configuration,
null );
-
-DefaultModelBuildingListener listener = new
DefaultModelBuildingListener( projectBuildingHelper, configuration );
-request.setModelBuildingListeners( Arrays.asList( listener ) );
-
-if ( localProject )
-{
-request.setPomFile( pomFile );
-}
-else
-{
-request.setModelSource( new FileModelSource( pomFile ) );
-}
ClassLoader oldContextClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
-ModelBuildingResult result;
-try
-{
-result = modelBuilder.build( request );
-}
-catch ( ModelBuildingException e )
-{
-throw new ProjectBuildingException( e.getModelId(),
Encountered POM errors, pomFile, e );
-}
+MavenProject project = configuration.getProject();
-Model model = result.getEffectiveModel();
+ListModelProblem modelProblems = null;
-if ( localProject !result.getProblems().isEmpty()
logger.isWarnEnabled() )
+if ( project == null )
{
-logger.warn( );
-logger.warn( Some problems were encountered while building
the effective model for + model.getId() );
+ModelBuildingRequest request = getModelBuildingRequest(
configuration, null );
+
+DefaultModelBuildingListener listener = new
DefaultModelBuildingListener( projectBuildingHelper, configuration );
+request.setModelBuildingListeners( Arrays.asList( listener ) );
+
+if ( localProject )
+{
+request.setPomFile( pomFile );
+}
+else
+{
+request.setModelSource( new FileModelSource( pomFile ) );
+}
+
+ModelBuildingResult result;
+try
+{
+result = modelBuilder.build( request );
+}
+catch ( ModelBuildingException e )
+{
+throw new ProjectBuildingException( e.getModelId(),
Encountered POM errors, pomFile, e );
+}
+
+
svn commit: r803995 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-model-builder/src/main/java/org/apache/maven/model/building/ maven-model-builder/src/main/java/org/ap
Author: bentmann
Date: Thu Aug 13 19:17:19 2009
New Revision: 803995
URL: http://svn.apache.org/viewvc?rev=803995view=rev
Log:
[MNG-4297] Disallow use of properties in the project coordinates
o For Maven 3.0, started to produce a warning
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=803995r1=803994r2=803995view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Aug 13 19:17:19 2009
@@ -322,7 +322,7 @@
logger.warn( It is highly recommended to fix these problems
+ because they threaten the stability of your build. );
logger.warn( );
-logger.warn( For this reason, future Maven versions will no
+logger.warn( For this reason, future Maven versions might no
+ longer support building such malformed projects. );
logger.warn( );
}
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=803995r1=803994r2=803995view=diff
==
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Thu Aug 13 19:17:19 2009
@@ -289,6 +289,7 @@
model.setPomFile( pomFile );
+problems.setSourceHint( model );
modelValidator.validateRawModel( model, request, problems );
return model;
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=803995r1=803994r2=803995view=diff
==
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Thu Aug 13 19:17:19 2009
@@ -71,6 +71,10 @@
if ( request.getValidationLevel() =
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
{
+validateStringNoExpression( groupId, problems, true,
model.getGroupId() );
+validateStringNoExpression( artifactId, problems, true,
model.getArtifactId() );
+validateStringNoExpression( version, problems, true,
model.getVersion() );
+
validateDependencies( problems, model.getDependencies(),
dependencies.dependency, request );
if ( model.getDependencyManagement() != null )
@@ -385,6 +389,24 @@
// Field validation
// --
+private boolean validateStringNoExpression( String fieldName,
ModelProblemCollector problems, boolean warning,
+String string )
+{
+if ( !hasExpression( string ) )
+{
+return true;
+}
+
+addViolation( problems, warning, ' + fieldName + ' contains an
expression but should be a constant. );
+
+return false;
+}
+
+private boolean hasExpression( String value )
+{
+return value != null value.indexOf( ${ ) = 0;
+}
+
private boolean validateStringNotEmpty( String fieldName,
ModelProblemCollector problems, boolean warning, String string )
{
return validateStringNotEmpty( fieldName, problems, warning, string,
null );
svn commit: r804000 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Author: bentmann
Date: Thu Aug 13 19:27:16 2009
New Revision: 804000
URL: http://svn.apache.org/viewvc?rev=804000view=rev
Log:
o Removed logging of model problems from the project builder (that kind of
reporting should be handled in higher levels)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=804000r1=803999r2=804000view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Thu Aug 13 19:27:16 2009
@@ -47,7 +47,6 @@
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
@@ -58,8 +57,6 @@
public class DefaultProjectBuilder
implements ProjectBuilder
{
-@Requirement
-private Logger logger;
@Requirement
private ModelBuilder modelBuilder;
@@ -126,27 +123,6 @@
modelProblems = result.getProblems();
-Model model = result.getEffectiveModel();
-
-if ( localProject !result.getProblems().isEmpty()
logger.isWarnEnabled() )
-{
-logger.warn( );
-logger.warn( Some problems were encountered while
building the effective model for + model.getId() );
-
-for ( ModelProblem problem : result.getProblems() )
-{
-logger.warn( problem.getMessage() );
-}
-
-logger.warn( );
-logger.warn( It is highly recommended to fix these
problems
-+ because they threaten the stability of your
build. );
-logger.warn( );
-logger.warn( For this reason, future Maven versions will
no
-+ longer support building such malformed projects.
);
-logger.warn( );
-}
-
project = toProject( result, configuration, listener );
}
svn commit: r804030 - /maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Author: hboutemy
Date: Thu Aug 13 21:15:25 2009
New Revision: 804030
URL: http://svn.apache.org/viewvc?rev=804030view=rev
Log:
free memory once report has been generated
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Modified:
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java?rev=804030r1=804029r2=804030view=diff
==
---
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
(original)
+++
maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Thu Aug 13 21:15:25 2009
@@ -452,6 +452,9 @@
if ( result != null )
{
generateReport( locale, result );
+// free memory
+result = null;
+linkCheck = null;
}
}
