svn commit: r1230230 - /maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
Author: rfscholte Date: Wed Jan 11 20:16:53 2012 New Revision: 1230230 URL: http://svn.apache.org/viewvc?rev=1230230view=rev Log: Fix typo's in text Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1230230r1=1230229r2=1230230view=diff == --- maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo (original) +++ maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Wed Jan 11 20:16:53 2012 @@ -175,7 +175,7 @@ multiplicity*/multiplicity /association description -A map of projects to versions to use when moving the given projects back into devlopment after release. +A map of projects to versions to use when moving the given projects back into development after release. /description /field field @@ -267,7 +267,7 @@ version1.0.0+/version typeboolean/type description -Whether to use the parent pom version for submodule verstions. +Whether to use the parent pom version for submodule versions. /description /field field
svn commit: r1230241 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: dennisl
Date: Wed Jan 11 20:45:09 2012
New Revision: 1230241
URL: http://svn.apache.org/viewvc?rev=1230241view=rev
Log:
Cleanup maven-invoker-plugin configuration. It is already configured in
maven-plugins parent, which caused a duplicate invocation of this plugin.
Similar to r1228917.
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=1230241r1=1230240r2=1230241view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Jan 11 20:45:09 2012
@@ -182,30 +182,12 @@ under the License.
artifactIdmaven-invoker-plugin/artifactId
version1.5/version
configuration
- debugtrue/debug
- projectsDirectorysrc/it/projectsDirectory
- cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
- pomIncludes
-pomInclude*/pom.xml/pomInclude
- /pomIncludes
- preBuildHookScriptsetup/preBuildHookScript
- postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
- settingsFilesrc/it/settings.xml/settingsFile
goals
goalclean/goal
goalsite/goal
/goals
/configuration
-executions
- execution
-idintegration-test/id
-goals
- goalinstall/goal
- goalrun/goal
-/goals
- /execution
-/executions
/plugin
/plugins
/build
svn commit: r1230244 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: dennisl
Date: Wed Jan 11 20:51:14 2012
New Revision: 1230244
URL: http://svn.apache.org/viewvc?rev=1230244view=rev
Log:
The version for maven-invoker-plugin is inherited.
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=1230244r1=1230243r2=1230244view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Jan 11 20:51:14 2012
@@ -180,7 +180,6 @@ under the License.
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.5/version
configuration
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
goals
svn commit: r1230247 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Wed Jan 11 20:53:22 2012
New Revision: 1230247
URL: http://svn.apache.org/viewvc?rev=1230247view=rev
Log:
Another set of generics applied
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1230247r1=1230246r2=1230247view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Wed Jan 11 20:53:22 2012
@@ -380,12 +380,12 @@ public abstract class AbstractRewritePom
}
}
-private void rewriteVersion( Element rootElement, Namespace namespace, Map
mappedVersions, String projectId,
+private void rewriteVersion( Element rootElement, Namespace namespace,
MapString, String mappedVersions, String projectId,
MavenProject project, String parentVersion )
throws ReleaseFailureException
{
Element versionElement = rootElement.getChild( version, namespace );
-String version = (String) mappedVersions.get( projectId );
+String version = mappedVersions.get( projectId );
if ( version == null )
{
throw new ReleaseFailureException( Version for ' +
project.getName() + ' was not mapped );
@@ -743,12 +743,12 @@ public abstract class AbstractRewritePom
return result;
}
-protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey, Map resolvedSnapshots );
+protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey, MapString, MapString,String resolvedSnapshots );
-protected abstract Map getOriginalVersionMap( ReleaseDescriptor
releaseDescriptor, ListMavenProject reactorProjects,
+protected abstract MapString, String getOriginalVersionMap(
ReleaseDescriptor releaseDescriptor, ListMavenProject reactorProjects,
boolean simulate );
-protected abstract Map getNextVersionMap( ReleaseDescriptor
releaseDescriptor );
+protected abstract MapString,String getNextVersionMap( ReleaseDescriptor
releaseDescriptor );
protected abstract void transformScm( MavenProject project, Element
rootElement, Namespace namespace,
ReleaseDescriptor releaseDescriptor,
String projectId,
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1230247r1=1230246r2=1230247view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
Wed Jan 11 20:53:22 2012
@@ -212,8 +212,8 @@ public class GenerateReleasePomsPhase
ReleaseResult result )
throws ReleaseFailureException, ReleaseExecutionException
{
-Map originalVersions = getOriginalVersionMap( releaseDescriptor,
reactorProjects );
-Map mappedVersions = getNextVersionMap( releaseDescriptor );
+MapString, String originalVersions = getOriginalVersionMap(
releaseDescriptor, reactorProjects );
+MapString, String mappedVersions = getNextVersionMap(
releaseDescriptor );
MavenProject releaseProject = new
svn commit: r1230250 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: dennisl
Date: Wed Jan 11 21:09:06 2012
New Revision: 1230250
URL: http://svn.apache.org/viewvc?rev=1230250view=rev
Log:
Remove dependency on xerces:xmlParserAPIs which is bundled with Java 5 which is
now the minimum requirement for this plugin.
Remove unused dependencies: doxia-core, maven-doxia-tools and
plexus-interpolation.
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=1230250r1=1230249r2=1230250view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Jan 11 21:09:06 2012
@@ -101,11 +101,6 @@ under the License.
!-- doxia --
dependency
groupIdorg.apache.maven.doxia/groupId
- artifactIddoxia-core/artifactId
- version${doxiaVersion}/version
-/dependency
-dependency
- groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-sink-api/artifactId
version${doxiaVersion}/version
/dependency
@@ -120,13 +115,6 @@ under the License.
version${doxiaVersion}/version
/dependency
-!-- shared --
-dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-doxia-tools/artifactId
- version1.2.1/version
-/dependency
-
!-- plexus --
dependency
groupIdorg.codehaus.plexus/groupId
@@ -138,11 +126,6 @@ under the License.
artifactIdplexus-utils/artifactId
version2.0.5/version
/dependency
-dependency
- groupIdorg.codehaus.plexus/groupId
- artifactIdplexus-interpolation/artifactId
- version1.13/version
-/dependency
!-- pmd --
dependency
@@ -151,13 +134,6 @@ under the License.
version${pmdVersion}/version
/dependency
-!-- misc --
-dependency
- groupIdxerces/groupId
- artifactIdxmlParserAPIs/artifactId
- version2.6.2/version
-/dependency
-
!-- test --
dependency
groupIdorg.apache.maven.plugin-testing/groupId
svn commit: r1230265 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/resources: cpd-report_fr.properties pmd-report_fr.properties
Author: olamy Date: Wed Jan 11 21:41:54 2012 New Revision: 1230265 URL: http://svn.apache.org/viewvc?rev=1230265view=rev Log: add fr i18n for cpd Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties - copied, changed from r1230250, maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties Copied: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties (from r1230250, maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties?p2=maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.propertiesp1=maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.propertiesr1=1230250r2=1230265rev=1230265view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties Wed Jan 11 21:41:54 2012 @@ -15,10 +15,12 @@ # specific language governing permissions and limitations # under the License. -report.pmd.name=Rapport PMD -report.pmd.description=Vérification des règles de codage. -report.pmd.title=Résultats PMD -report.pmd.column.violation=Violation -report.pmd.column.line=Ligne -report.pmd.pmdlink=Le document suivant contient les résultats de -report.pmd.files=Fichiers +report.cpd.name=CPD Report +report.cpd.description=D\u00E9tection de code dupliqu\u00E9e +report.cpd.title=CPD Results +report.cpd.column.file=Fichier +report.cpd.column.project=Projet +report.cpd.column.line=Ligne +report.cpd.cpdlink=Le document suivant contient les r\u00E9sultats de l'inspection PMD +report.cpd.dupes=Duplicatas +report.cpd.noProblems=CPD a trouv\u00E9 les probl\u00E8mes suivants dans votre code source Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties?rev=1230265r1=1230264r2=1230265view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_fr.properties Wed Jan 11 21:41:54 2012 @@ -16,9 +16,9 @@ # under the License. report.pmd.name=Rapport PMD -report.pmd.description=Vérification des règles de codage. -report.pmd.title=Résultats PMD +report.pmd.description=V\u00E9rification des r\u00E8gles de codage. +report.pmd.title=R\u00E9sultats PMD report.pmd.column.violation=Violation report.pmd.column.line=Ligne -report.pmd.pmdlink=Le document suivant contient les résultats de +report.pmd.pmdlink=Le document suivant contient les r\u00E9sultats de report.pmd.files=Fichiers
svn commit: r1230268 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/resources: cpd-report_nl.properties pmd-report_nl.properties
Author: rfscholte Date: Wed Jan 11 21:47:39 2012 New Revision: 1230268 URL: http://svn.apache.org/viewvc?rev=1230268view=rev Log: Add dutch resource bundles Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties?rev=1230268view=auto == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties (added) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_nl.properties Wed Jan 11 21:47:39 2012 @@ -0,0 +1,26 @@ +# 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. + +report.cpd.name=CPD Rapport +report.cpd.description=Dubbele code detectie. +report.cpd.title=CPD Resultaten +report.cpd.column.file=Bestand +report.cpd.column.project=Project +report.cpd.column.line=Regel +report.cpd.cpdlink=Het volgende document bevat de resultaten van PMD's +report.cpd.dupes=Dubbelingen +report.cpd.noProblems=CPD heeft geen fouten gevonden in de code. Added: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties?rev=1230268view=auto == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties (added) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/pmd-report_nl.properties Wed Jan 11 21:47:39 2012 @@ -0,0 +1,25 @@ +# 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. + +report.pmd.name=PMD Rapport +report.pmd.description=Controle van programmeerregels. +report.pmd.title=PMD Resultaten +report.pmd.column.violation=Overtreding +report.pmd.column.line=Regel +report.pmd.pmdlink=Het volgende document bevat de resultaten van +report.pmd.files=Bestanden +report.pmd.noProblems=PMD heeft geen fouten gevonden in de code.
svn propchange: r1230268 - svn:log
Author: dennisl Revision: 1230268 Modified property: svn:log Modified: svn:log at Wed Jan 11 22:27:23 2012 -- --- svn:log (original) +++ svn:log Wed Jan 11 22:27:23 2012 @@ -1 +1 @@ -Add dutch resource bundles +[MPMD-136] Add dutch resource bundles
svn propchange: r1230265 - svn:log
Author: dennisl Revision: 1230265 Modified property: svn:log Modified: svn:log at Wed Jan 11 22:29:17 2012 -- --- svn:log (original) +++ svn:log Wed Jan 11 22:29:17 2012 @@ -1 +1 @@ -add fr i18n for cpd +[MPMD-137] add fr i18n for cpd
svn commit: r1230294 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: dennisl Date: Wed Jan 11 22:34:29 2012 New Revision: 1230294 URL: http://svn.apache.org/viewvc?rev=1230294view=rev Log: [MPMD-136] Add Dutch translation - Add Dutch to the l10n report 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=1230294r1=1230293r2=1230294view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Jan 11 22:34:29 2012 @@ -188,6 +188,7 @@ under the License. locales localede/locale localefr/locale +localenl/locale localept_BR/locale localesv/locale /locales
svn commit: r1230296 - /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
Author: dennisl
Date: Wed Jan 11 22:35:26 2012
New Revision: 1230296
URL: http://svn.apache.org/viewvc?rev=1230296view=rev
Log:
Fix error reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java?rev=1230296r1=1230295r2=1230296view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
Wed Jan 11 22:35:26 2012
@@ -117,20 +117,18 @@ public class CpdViolationCheckMojo
msgs.put( text, xpp.getText().trim() );
break;
case XmlPullParser.START_TAG:
+String nm = xpp.getName();
+if ( msgs.containsKey( nm ) )
{
-String nm = xpp.getName();
-if ( msgs.containsKey( nm ) )
+int cnt = 1;
+while ( msgs.containsKey( nm + cnt ) )
{
-int cnt = 1;
-while ( msgs.containsKey( nm + cnt ) )
-{
-++cnt;
-}
-nm = nm + cnt;
+++cnt;
}
-msgs.put( nm, getErrorDetails( xpp ) );
-break;
+nm = nm + cnt;
}
+msgs.put( nm, getErrorDetails( xpp ) );
+break;
default:
}
tp = xpp.next();
svn commit: r1230298 - in /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release: config/ phase/
Author: rfscholte
Date: Wed Jan 11 22:39:25 2012
New Revision: 1230298
URL: http://svn.apache.org/viewvc?rev=1230298view=rev
Log:
Again another set of generics
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1230298r1=1230297r2=1230298view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
Wed Jan 11 22:39:25 2012
@@ -210,27 +210,27 @@ public class ReleaseUtils
private static void loadResolvedDependencies( Properties prop,
ReleaseDescriptor descriptor )
{
-Map resolvedDependencies = new HashMap();
+MapString, MapString, String resolvedDependencies = new
HashMapString, MapString, String();
Set entries = prop.entrySet();
-Iterator iterator = entries.iterator();
+IteratorEntryString, String iterator = entries.iterator();
String propertyName;
-Entry currentEntry;
+EntryString, String currentEntry;
while ( iterator.hasNext() )
{
-currentEntry = (Entry) iterator.next();
+currentEntry = iterator.next();
propertyName = (String) currentEntry.getKey();
if ( propertyName.startsWith( dependency. ) )
{
-Map versionMap;
+MapString, String versionMap;
String artifactVersionlessKey;
int startIndex;
int endIndex;
String versionType;
-versionMap = new HashMap();
+versionMap = new HashMapString, String();
startIndex = propertyName.lastIndexOf( dependency. );
if ( propertyName.indexOf( .development ) != -1 )
@@ -248,11 +248,11 @@ public class ReleaseUtils
if ( resolvedDependencies.containsKey( artifactVersionlessKey
) )
{
-versionMap = (Map) resolvedDependencies.get(
artifactVersionlessKey );
+versionMap = resolvedDependencies.get(
artifactVersionlessKey );
}
else
{
-versionMap = new HashMap();
+versionMap = new HashMapString, String();
resolvedDependencies.put( artifactVersionlessKey,
versionMap );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1230298r1=1230297r2=1230298view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Wed Jan 11 22:39:25 2012
@@ -253,7 +253,8 @@ public abstract class AbstractRewritePom
Namespace namespace = rootElement.getNamespace();
MapString, String mappedVersions = getNextVersionMap(
releaseDescriptor );
MapString, String originalVersions = getOriginalVersionMap(
releaseDescriptor, reactorProjects, simulate );
-Map resolvedSnapshotDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
+@SuppressWarnings(unchecked)
+
svn commit: r1230411 - /maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties
Author: hboutemy Date: Thu Jan 12 06:15:35 2012 New Revision: 1230411 URL: http://svn.apache.org/viewvc?rev=1230411view=rev Log: fixed typos Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties?rev=1230411r1=1230410r2=1230411view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/main/resources/cpd-report_fr.properties Thu Jan 12 06:15:35 2012 @@ -16,11 +16,11 @@ # under the License. report.cpd.name=CPD Report -report.cpd.description=D\u00E9tection de code dupliqu\u00E9e -report.cpd.title=CPD Results +report.cpd.description=D\u00E9tection de code dupliqu\u00E9 +report.cpd.title=R\u00E9sultats CPD report.cpd.column.file=Fichier report.cpd.column.project=Projet report.cpd.column.line=Ligne -report.cpd.cpdlink=Le document suivant contient les r\u00E9sultats de l'inspection PMD +report.cpd.cpdlink=Le document suivant contient les r\u00E9sultats de l'inspection CPD report.cpd.dupes=Duplicatas report.cpd.noProblems=CPD a trouv\u00E9 les probl\u00E8mes suivants dans votre code source
