diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt index 067cf8906d..930defa46d 100644 --- a/pmd/etc/changelog.txt +++ b/pmd/etc/changelog.txt @@ -1,4 +1,4 @@ -January 31, 2012 - 5.0-alpha +???? ??, 2012 - 5.0: TODO - Release blockers - Must implement before this release can be finally finished @@ -41,6 +41,9 @@ TODO - Release blockers - Must implement before this release can be finally fini --- + +January 31, 2012 - 5.0-alpha: + This version of PMD breaks API compatibility with prior versions of PMD, as well as RuleSet XML compatibility. Also the maven coordinates (groupId) have been changed. The decision to break compatibility, allows PMD @@ -487,7 +490,7 @@ New JSP rules: Basic ruleset: NoInlineScript New ECMAScript rules: - Basic ruleset: AssignmentInOperand,ConsistentReturn,InnaccurateNumericLiteral,ScopeForInVariable,UnreachableCode + Basic ruleset: AssignmentInOperand,ConsistentReturn,InnaccurateNumericLiteral,ScopeForInVariable,UnreachableCode,EqualComparison,GlobalVariable Braces ruleset: ForLoopsMustUseBraces,IfStmtsMustUseBraces,IfElseStmtsMustUseBraces,WhileLoopsMustUseBraces Unnecessary ruleset: UnnecessaryParentheses,UnnecessaryBlock diff --git a/pmd/etc/release_process.txt b/pmd/etc/release_process.txt index f246407b57..5e3cdf3b3c 100644 --- a/pmd/etc/release_process.txt +++ b/pmd/etc/release_process.txt @@ -8,7 +8,7 @@ $ svn status Ensure all the new rules are listed in a src/main/resources/rulesets/releases/.xml file. -Update the "download" and "what's new" link in navigation.xml. +Update the "download" and "what's new" link in site.pre.xml. Update version/release info in etc/changelog.txt. @@ -16,15 +16,17 @@ $ mvn verify post-site (order of targets DOES matter) Unzip and test manually (just to be on the safe side of the road): -./bin/pmd.sh ~/tmp/Test.java xml java-unusedcode -./bin/pmd.sh ~/tmp/Test.java html rulesets/unusedcode.xml +./bin/run.sh pmd ~/tmp/Test.java xml java-unusedcode +./bin/run.sh pmd ~/tmp/Test.java html rulesets/java/unusedcode.xml Check in all (version) changes to trunk: $ svn ci -m "pmd: Prepare pmd release " -Let the maven create a release branch (note - this is of course not needed if you are already on a release/maintenance -branch). Maven will automatically increase the version in trunk. +Let maven create a release branch (note - this is of course not needed if you are already on a release/maintenance +branch). Maven will automatically increase the version in trunk. In case you create a alpha/preview release and you +want to stay with the current version in trunk, use these +additional properties: -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false $ mvn release:branch -DbranchName=.x @@ -37,6 +39,8 @@ Now let maven create a release tag. $ mvn release:clean release:prepare +Note: For the tag/label name we currently use this naming pattern: pmd_release__ + The next command will checkout PMD from the tag just created and will build and deploy it to sonatype OSS repositories: @@ -62,11 +66,11 @@ Finally, in order to publish the release to Maven central, you need to release P -Public the release on sourceforge: -- Go to Admin, File Releases, Add release -- Paste stuff into the changelog/readme boxes +Publish the release on sourceforge: +- Go to Files, to folder "pmd", create a new subfolder for the new version - Add the pmd--bin.zip file - Add the pmd--src.zip file +- Add the file etc/changelog.txt as ReadMe.txt file Upload command below will create and upload the maven artifacts to sourceforge. Login info for 'pmd-repo' and 'pmd-site' must be defined in ~/.m2/settings.xml diff --git a/pmd/src/site/site.pre.xml b/pmd/src/site/site.pre.xml index 176cbc6b06..235c011c1a 100644 --- a/pmd/src/site/site.pre.xml +++ b/pmd/src/site/site.pre.xml @@ -24,8 +24,8 @@