svn commit: r731219 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0080/ resources/it0081/ resources/it0082/ resources/it0083/ resources/it008
Author: bentmann Date: Sun Jan 4 02:44:12 2009 New Revision: 731219 URL: http://svn.apache.org/viewvc?rev=731219view=rev Log: o Renamed ITs to match corresponding JIRA issues Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0084Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorDepResolutionTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0082Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java - copied, changed from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0092Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0818/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0820/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0084/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1088/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0082/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1233/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1908/ - copied from r731212, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0092/ Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0081Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0082Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0083Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0084Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0092Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0081/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0082/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0083/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0084/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0092/ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
svn commit: r731246 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: carlos Date: Sun Jan 4 04:47:01 2009 New Revision: 731246 URL: http://svn.apache.org/viewvc?rev=731246view=rev Log: Add commons-digester Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv 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=731246r1=731245r2=731246view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Sun Jan 4 04:47:01 2009 @@ -41,6 +41,7 @@ commons-beanutils,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Niall Pemberton,nia...@apache.org,, commons-chain,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Niall Pemberton,nia...@apache.org,, commons-collections,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Niall Pemberton,nia...@apache.org,, +commons-digester,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Rahul Akolkar,rahul.akol...@gmail.com,, commons-email,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh commons-fileupload,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh,Jochen Wiedmann,joc...@apache.org,, commons-io,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh
svn commit: r731249 - /maven/site/trunk/src/site/apt/netbeans-module.apt
Author: mkleint
Date: Sun Jan 4 05:06:50 2009
New Revision: 731249
URL: http://svn.apache.org/viewvc?rev=731249view=rev
Log:
update netbeans integration page to reflect current state
Modified:
maven/site/trunk/src/site/apt/netbeans-module.apt
Modified: maven/site/trunk/src/site/apt/netbeans-module.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/netbeans-module.apt?rev=731249r1=731248r2=731249view=diff
==
--- maven/site/trunk/src/site/apt/netbeans-module.apt (original)
+++ maven/site/trunk/src/site/apt/netbeans-module.apt Sun Jan 4 05:06:50 2009
@@ -3,18 +3,21 @@
-
Milos Kleint
-
- 7 May 2008
+ 4 Jan 2009
-
Maven 2.x Module for Netbeans
- The Netbeans integration is developed at {{http://mevenide.codehaus.org}} It
allows to load any Maven 2 project into Netbeans and start coding immediately.
-To get a current feature list along with screenshots, please refer to the
{{http://mevenide.codehaus.org/m2-site}} download page.
-
- An article describing the current features in detail is available at the
{{{http://wiki.netbeans.org/MavenBestPractices}Netbeans.org wiki}} as well.
+ The Netbeans integration was for a long time developed at
{{http://mevenide.codehaus.org}}, it was moved to netbeans.org and will be part
of standard NetBeans distribution since 7.0.
+It allows to load any Maven 2 project into Netbeans and start coding
immediately.
+To get a current feature list along with screenshots, description and hints
please refer to the {{{http://wiki.netbeans.org/MavenBestPractices}NetBeans.org
wiki}} page.
* Binaries and Installation
- The Maven integration is easily accessible in NetBeans 6.0 and 6.1 via the
Tools/Plugins dialog.
-More detailed instructions available (also for older versions of NetBeans) at
the
{{{http://mevenide.codehaus.org/m2-site/mevenide2-netbeans/installation.html}Mevenide
site}}.
+ The Maven integration is easily accessible in NetBeans 6.0, 6.1 and 6.5 via
the Tools/Plugins dialog. In 7.0 and later it's part of the standard
installation.
+More detailed instructions on installation available (for older versions of
NetBeans) at the
{{{http://mevenide.codehaus.org/m2-site/mevenide2-netbeans/installation.html}Mevenide
site}}.
+
+* Bugs reports and enhancement requests
+
+ Bug, enhancements and feature requests are to be filed in the NetBeans.org
{{{http://www.netbeans.org/issues/enter_bug.cgi?component=maven}issue tracking
system}}.
svn commit: r731269 - in /maven/components/trunk: ./ maven-compat/ maven-core/ maven-distribution/ maven-embedder/ maven-lifecycle/ maven-mercury/ maven-model/ maven-plugin-api/ maven-project-builder/
Author: jvanzyl Date: Sun Jan 4 07:28:42 2009 New Revision: 731269 URL: http://svn.apache.org/viewvc?rev=731269view=rev Log: [maven-release-plugin] prepare release 3.0-alpha-1 Modified: maven/components/trunk/maven-compat/pom.xml maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-lifecycle/pom.xml maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-model/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-project-builder/pom.xml maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-reporting-api/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=731269r1=731268r2=731269view=diff == --- maven/components/trunk/maven-compat/pom.xml (original) +++ maven/components/trunk/maven-compat/pom.xml Sun Jan 4 07:28:42 2009 @@ -8,12 +8,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-compat/artifactId Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=731269r1=731268r2=731269view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Jan 4 07:28:42 2009 @@ -10,12 +10,11 @@ governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=731269r1=731268r2=731269view=diff == --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Sun Jan 4 07:28:42 2009 @@ -13,13 +13,12 @@ License for the specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent artifactIdmaven-distribution/artifactId nameMaven Distribution/name @@ -120,8 +119,7 @@ createDependencyReducedPomfalse/createDependencyReducedPom keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope transformers -transformer - implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer / +transformer implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer / /transformers artifactSet excludes @@ -175,8 +173,7 @@
svn commit: r731270 - in /maven/components/tags/3.0-alpha-1: ./ maven-compat/ maven-compat/src/main/java/org/apache/maven/settings/ maven-core/ maven-core/src/main/java/org/apache/maven/plugin/ maven-
Author: jvanzyl Date: Sun Jan 4 07:28:58 2009 New Revision: 731270 URL: http://svn.apache.org/viewvc?rev=731270view=rev Log: [maven-release-plugin] copy for tag 3.0-alpha-1 Added: maven/components/tags/3.0-alpha-1/ (props changed) - copied from r731174, maven/components/trunk/ maven/components/tags/3.0-alpha-1/maven-compat/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-compat/pom.xml maven/components/tags/3.0-alpha-1/maven-core/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-core/pom.xml maven/components/tags/3.0-alpha-1/maven-distribution/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-distribution/pom.xml maven/components/tags/3.0-alpha-1/maven-embedder/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-embedder/pom.xml maven/components/tags/3.0-alpha-1/maven-lifecycle/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-lifecycle/pom.xml maven/components/tags/3.0-alpha-1/maven-mercury/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-mercury/pom.xml maven/components/tags/3.0-alpha-1/maven-model/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-model/pom.xml maven/components/tags/3.0-alpha-1/maven-plugin-api/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-plugin-api/pom.xml maven/components/tags/3.0-alpha-1/maven-project-builder/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-project-builder/pom.xml maven/components/tags/3.0-alpha-1/maven-project/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-project/pom.xml maven/components/tags/3.0-alpha-1/maven-reporting-api/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-reporting-api/pom.xml maven/components/tags/3.0-alpha-1/maven-toolchain/pom.xml - copied unchanged from r731269, maven/components/trunk/maven-toolchain/pom.xml maven/components/tags/3.0-alpha-1/pom.xml - copied unchanged from r731269, maven/components/trunk/pom.xml Modified: maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java maven/components/tags/3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java maven/components/tags/3.0-alpha-1/maven-core/src/main/mdo/settings.mdo Propchange: maven/components/tags/3.0-alpha-1/ -- bugtraq:append = true Propchange: maven/components/tags/3.0-alpha-1/ -- bugtraq:label = Enter issue ID: Propchange: maven/components/tags/3.0-alpha-1/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/components/tags/3.0-alpha-1/ -- bugtraq:number = false Propchange: maven/components/tags/3.0-alpha-1/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/components/tags/3.0-alpha-1/ -- --- svn:ignore (added) +++ svn:ignore Sun Jan 4 07:28:58 2009 @@ -0,0 +1,19 @@ +release.properties +deleteme.version.properties +bootstrap +maven.log +target +.classpath +.project +bootstrap.repo +maven-component.i* +.settings +mboot.jar +dummy +build.ajproperties +.generated.lst +*.iml +*.iws +*.ipr +log.txt +setup_env.sh Propchange: maven/components/tags/3.0-alpha-1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 4 07:28:58 2009 @@ -0,0 +1,3 @@ +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/trunk:688587-696625,696644-699681 Propchange: maven/components/tags/3.0-alpha-1/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200 Modified: maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java URL: http://svn.apache.org/viewvc/maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=731270r1=731174r2=731270view=diff == --- maven/components/tags/3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java (original) +++
svn commit: r731271 - in /maven/components/trunk: ./ maven-compat/ maven-core/ maven-distribution/ maven-embedder/ maven-lifecycle/ maven-mercury/ maven-model/ maven-plugin-api/ maven-project-builder/
Author: jvanzyl Date: Sun Jan 4 07:29:07 2009 New Revision: 731271 URL: http://svn.apache.org/viewvc?rev=731271view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/trunk/maven-compat/pom.xml maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-lifecycle/pom.xml maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-model/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-project-builder/pom.xml maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-reporting-api/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-compat/pom.xml (original) +++ maven/components/trunk/maven-compat/pom.xml Sun Jan 4 07:29:07 2009 @@ -12,7 +12,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-compat/artifactId Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Jan 4 07:29:07 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Sun Jan 4 07:29:07 2009 @@ -18,7 +18,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-distribution/artifactId nameMaven Distribution/name Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Sun Jan 4 07:29:07 2009 @@ -13,7 +13,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-embedder/artifactId nameMaven Embedder/name Modified: maven/components/trunk/maven-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-lifecycle/pom.xml (original) +++ maven/components/trunk/maven-lifecycle/pom.xml Sun Jan 4 07:29:07 2009 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-lifecycle/artifactId Modified: maven/components/trunk/maven-mercury/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-mercury/pom.xml (original) +++ maven/components/trunk/maven-mercury/pom.xml Sun Jan 4 07:29:07 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-mercury/artifactId Modified: maven/components/trunk/maven-model/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=731271r1=731270r2=731271view=diff == --- maven/components/trunk/maven-model/pom.xml (original) +++
svn commit: r731273 - in /maven/components/trunk: maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvalua
Author: jvanzyl
Date: Sun Jan 4 07:32:19 2009
New Revision: 731273
URL: http://svn.apache.org/viewvc?rev=731273view=rev
Log:
o the release plugin manages to somehow get its own instance of a Settings so
the SettingsAdapter which I use everywhere else gets used except in the release
plugin so I have to jack back in the hardcoded RuntimeInfo until I figure out
why. not a big deal, i'll list it in the compatibility notes. on another note
if you start the release process using release:prepare and it fails, you make
code changes, it will happily let you continue and not check the status again.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-core/src/main/mdo/settings.mdo
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=731273r1=731272r2=731273view=diff
==
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
Sun Jan 4 07:32:19 2009
@@ -29,8 +29,19 @@
*/
public class RuntimeInfo
{
+public static final String userHome = System.getProperty( user.home );
+
+public static final File userMavenConfigurationHome = new File( userHome,
.m2 );
+
+public static final File DEFAULT_USER_SETTINGS_FILE = new File(
userMavenConfigurationHome, settings.xml );
+
private File settings;
-
+
+public RuntimeInfo()
+{
+this.settings = DEFAULT_USER_SETTINGS_FILE;
+}
+
public RuntimeInfo( File settings )
{
this.settings = settings;
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=731273r1=731272r2=731273view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Sun Jan 4 07:32:19 2009
@@ -336,6 +336,7 @@
else if ( settings.equals( expression ) )
{
value = context.getSettings();
+System.out.println( value );
}
else if ( expression.startsWith( settings ) )
{
Modified: maven/components/trunk/maven-core/src/main/mdo/settings.mdo
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/mdo/settings.mdo?rev=731273r1=731272r2=731273view=diff
==
--- maven/components/trunk/maven-core/src/main/mdo/settings.mdo (original)
+++ maven/components/trunk/maven-core/src/main/mdo/settings.mdo Sun Jan 4
07:32:19 2009
@@ -393,6 +393,23 @@
return profileMap;
}
+
+private RuntimeInfo runtimeInfo;
+
+public void setRuntimeInfo( RuntimeInfo runtimeInfo )
+{
+this.runtimeInfo = runtimeInfo;
+}
+
+public RuntimeInfo getRuntimeInfo()
+{
+if ( runtimeInfo == null )
+{
+runtimeInfo = new RuntimeInfo();
+}
+return runtimeInfo;
+}
+
]]
/code
/codeSegment
svn commit: r731274 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Author: jvanzyl
Date: Sun Jan 4 07:32:55 2009
New Revision: 731274
URL: http://svn.apache.org/viewvc?rev=731274view=rev
Log:
o get rid of debug output
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=731274r1=731273r2=731274view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Sun Jan 4 07:32:55 2009
@@ -336,7 +336,6 @@
else if ( settings.equals( expression ) )
{
value = context.getSettings();
-System.out.println( value );
}
else if ( expression.startsWith( settings ) )
{
svn commit: r731275 - /maven/components/trunk/maven-core/src/main/mdo/settings.mdo
Author: jvanzyl Date: Sun Jan 4 07:36:11 2009 New Revision: 731275 URL: http://svn.apache.org/viewvc?rev=731275view=rev Log: o note in the settings.mdo file about the release plugin Modified: maven/components/trunk/maven-core/src/main/mdo/settings.mdo Modified: maven/components/trunk/maven-core/src/main/mdo/settings.mdo URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/mdo/settings.mdo?rev=731275r1=731274r2=731275view=diff == --- maven/components/trunk/maven-core/src/main/mdo/settings.mdo (original) +++ maven/components/trunk/maven-core/src/main/mdo/settings.mdo Sun Jan 4 07:36:11 2009 @@ -394,6 +394,8 @@ return profileMap; } +//[MNG-3954] :: this is required for the release plugin + private RuntimeInfo runtimeInfo; public void setRuntimeInfo( RuntimeInfo runtimeInfo )
svn commit: r731276 - /maven/components/trunk/maven-compat/compatibility.cfl
Author: jvanzyl
Date: Sun Jan 4 07:41:15 2009
New Revision: 731276
URL: http://svn.apache.org/viewvc?rev=731276view=rev
Log:
o notes about the RuntimeInfo class and the Settings object used in the release
plugin
Modified:
maven/components/trunk/maven-compat/compatibility.cfl
Modified: maven/components/trunk/maven-compat/compatibility.cfl
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/compatibility.cfl?rev=731276r1=731275r2=731276view=diff
==
--- maven/components/trunk/maven-compat/compatibility.cfl (original)
+++ maven/components/trunk/maven-compat/compatibility.cfl Sun Jan 4 07:41:15
2009
@@ -46,6 +46,19 @@
* org.apache.maven.artifact.resolver.transform.*
* org.apache.maven.artifact.resolver.versioning.*
+h2. Settings
+
+The settings are historically a CLI-based mechanism for setting preferences.
It should have never gone beyond the core into plugins
+or other tools. Unfortunately we allowed the ${settings} expression in plugins
and from there it made its way into components like
+the release manager. The release manager in turn never evolved to decouple
itself from the settings and it requires a recreation
+of the entire Maven environment to work and grabs the RuntimeInfo info class
from the settings in order to do this. Other plugins
+may require this and we'll have to find them them and push them toward using
the Invoker where the Maven environment is taken care
+of and restrict/forbid the use of settings in plugins. Everything required is
in the exeution request and therefore the session and
+that's all plugins should need.
+
+The changes made relate to MNG-3954, where the RuntimeInfo class needed to be
partially rescurrected in order to make the release
+plugin happy.
+
h2. Changes to the CLI
* Log file support has been added i.e mvn -l log.txt clean install
* Plugin registry option has not been supported in the core and it lagged
around in the CLI
\ No newline at end of file
svn commit: r731277 - /maven/components/tags/3.0-alpha-1/
Author: jvanzyl Date: Sun Jan 4 07:46:14 2009 New Revision: 731277 URL: http://svn.apache.org/viewvc?rev=731277view=rev Log: o remove the weird tag the release plugin let me create Removed: maven/components/tags/3.0-alpha-1/
svn commit: r731253 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
Author: bentmann
Date: Sun Jan 4 05:16:59 2009
New Revision: 731253
URL: http://svn.apache.org/viewvc?rev=731253view=rev
Log:
[MCHANGES-147] MavenProject object not initialize due to mispelling into the
declaration
Submitted by: Jean-Paul GUIGUI
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=731253r1=731252r2=731253view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
Sun Jan 4 05:16:59 2009
@@ -53,7 +53,7 @@
//=
/**
- * @parameter expression=${project}
+ * @parameter expression=${project}
* @readonly
*/
private MavenProject project;
svn commit: r731298 - in /maven/plugins/trunk/maven-install-plugin/src: it/attach-jar-checksum/ it/pom-checksum/ it/pom-checksum/src/ it/pom-checksum/src/site/ main/java/org/apache/maven/plugin/instal
Author: bentmann
Date: Sun Jan 4 09:19:37 2009
New Revision: 731298
URL: http://svn.apache.org/viewvc?rev=731298view=rev
Log:
[MINSTALL-56] No checksums installed for project with packaging POM
o Added checksums for site descriptors (and any other metadata attached to
artifacts)
Added:
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
(with props)
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh?rev=731298r1=731297r2=731298view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
Sun Jan 4 09:19:37 2009
@@ -5,7 +5,6 @@
String[] paths =
{
-org/apache/maven/its/install/ajc/test/maven-metadata-local.xml,
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom,
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom.md5,
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom.sha1,
@@ -15,6 +14,12 @@
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar,
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.md5,
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.sha1,
+
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml,
+
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.md5,
+
org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.sha1,
+org/apache/maven/its/install/ajc/test/maven-metadata-local.xml,
+org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.md5,
+org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.sha1,
};
for ( String path : paths )
Added:
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml?rev=731298view=auto
==
---
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
(added)
+++
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
Sun Jan 4 09:19:37 2009
@@ -0,0 +1,23 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+project
+/project
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/src/site/site.xml
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh?rev=731298r1=731297r2=731298view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh
(original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh Sun
Jan 4 09:19:37 2009
svn commit: r731300 - /maven/core-integration-testing/trunk/core-it-suite/pom.xml
Author: bentmann
Date: Sun Jan 4 09:45:32 2009
New Revision: 731300
URL: http://svn.apache.org/viewvc?rev=731300view=rev
Log:
o Updated to emma4it-maven-plugin:1.2-SNAPSHOT
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=731300r1=731299r2=731300view=diff
==
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Sun Jan 4
09:45:32 2009
@@ -159,6 +159,11 @@
/build
/profile
profile
+ !--
+ NOTE: Maven 3.0-alpha-1 doesn't properly handle profiles+interpolation
so it requires Maven 2.x to use this
+ profile to generate coverage data for Maven 3.x:
+mvn test -Pemma -DmavenHome=apache-maven-3.x-home
+ --
idemma/id
properties
preparedMavenHome${project.build.directory}/distro/preparedMavenHome
@@ -170,6 +175,7 @@
artifactIdmaven-surefire-plugin/artifactId
configuration
skipfalse/skip
+ testFailureIgnoretrue/testFailureIgnore
/configuration
/plugin
plugin
@@ -185,24 +191,14 @@
/goals
configuration
tasks
+delete dir=${preparedMavenHome}/
copy todir=${preparedMavenHome} overwrite=true
fileset dir=${mavenHome}/
/copy
-move todir=${preparedMavenHome}/lib
- fileset dir=${preparedMavenHome}/lib/
- regexpmapper
from=^(maven)((-[^-]*)*?)(-[0-9].*)\.jar$$ to=\1\2.jar/
-/move
/tasks
/configuration
/execution
/executions
-dependencies
- dependency
-groupIdorg.apache.ant/groupId
-artifactIdant-nodeps/artifactId
-version1.7.1/version
- /dependency
-/dependencies
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
@@ -228,43 +224,68 @@
/execution
/executions
/plugin
-/plugins
- /build
- reporting
-plugins
plugin
groupIdorg.sonatype.maven.plugin/groupId
artifactIdemma4it-maven-plugin/artifactId
-version1.0/version
+version1.2-SNAPSHOT/version
+configuration
+ jarSets
+jarSet
+ directory${preparedMavenHome}/lib/directory
+ includes
+includemaven*.jar/include
+ /includes
+/jarSet
+ /jarSets
+ includes
+includeorg.apache.maven.*/include
+ /includes
+/configuration
+executions
+ execution
+idinstrument/id
+phaseprocess-test-classes/phase
+goals
+ goalinstrument/goal
+/goals
+ /execution
+ execution
+idreport/id
+phasetest/phase
+goals
+ goalreport/goal
+/goals
+ /execution
+/executions
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-clean-plugin/artifactId
configuration
- jarFiles
-jarFile${preparedMavenHome}/lib/maven.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-core.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-compat.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-embedder.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-lifecycle.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-mercury.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-model.jar/jarFile
-
jarFile${preparedMavenHome}/lib/maven-plugin-api.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-project.jar/jarFile
-
jarFile${preparedMavenHome}/lib/maven-project-builder.jar/jarFile
-
jarFile${preparedMavenHome}/lib/maven-reporting-api.jar/jarFile
-jarFile${preparedMavenHome}/lib/maven-toolchain.jar/jarFile
-
jarFile${preparedMavenHome}/lib/maven-shared-model.jar/jarFile
- /jarFiles
+ filesets
+fileset
+ directory${basedir}/directory
+ includes
+includecoverage.ec/include
+
svn commit: r731237 - /maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
Author: bentmann
Date: Sun Jan 4 04:24:34 2009
New Revision: 731237
URL: http://svn.apache.org/viewvc?rev=731237view=rev
Log:
[MPLUGIN-141] Output warning for deprecated component expressions
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=731237r1=731236r2=731237view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
Sun Jan 4 04:24:34 2009
@@ -510,7 +510,18 @@
pd.setAlias( alias );
}
-pd.setExpression( parameter.getNamedParameter(
JavaMojoAnnotation.PARAMETER_EXPRESSION ) );
+String expression = parameter.getNamedParameter(
JavaMojoAnnotation.PARAMETER_EXPRESSION );
+pd.setExpression( expression );
+
+if ( StringUtils.isNotEmpty( expression )
expression.startsWith( ${component. ) )
+{
+getLogger().warn( javaClass.getFullyQualifiedName() + #
+ field.getName() + : );
+getLogger().warn( The syntax );
+getLogger().warn( @parameter
expression=\${component.role#roleHint}\ );
+getLogger().warn( is deprecated, please use );
+getLogger().warn( @component role=\role\
roleHint=\roleHint\ );
+getLogger().warn( instead. );
+}
if ( ${reports}.equals( pd.getExpression() ) )
{
svn commit: r731252 - in /maven/plugins/trunk: maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ maven-d
Author: bentmann
Date: Sun Jan 4 05:11:57 2009
New Revision: 731252
URL: http://svn.apache.org/viewvc?rev=731252view=rev
Log:
o Avoided deprecated syntax @parameter expression=${component...}
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.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=731252r1=731251r2=731252view=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
Sun Jan 4 05:11:57 2009
@@ -236,9 +236,7 @@
private File outputDirectory;
/**
- * @parameter
expression=${component.org.codehaus.doxia.site.renderer.SiteRenderer}
- * @required
- * @readonly
+ * @component
*/
private SiteRenderer siteRenderer;
@@ -250,9 +248,7 @@
private boolean offline;
/**
- * @parameter
expression=${component.org.apache.maven.scm.manager.ScmManager}
- * @required
- * @readonly
+ * @component
*/
private ScmManager manager;
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java?rev=731252r1=731251r2=731252view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
Sun Jan 4 05:11:57 2009
@@ -44,8 +44,7 @@
* pre
* /#042;#042;
* #042; Velocity Component
- * #042; #064;parameter
expression=${component.org.codehaus.plexus.velocity.VelocityComponent}
- * #042; #064;readonly
+ * #042; #064;component
* #042;/
* private VelocityComponent velocity;
* /pre
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=731252r1=731251r2=731252view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Sun Jan 4 05:11:57 2009
@@ -50,18 +50,14 @@
/**
* Used to look up Artifacts in the remote repository.
*
- * @parameter
expression=${component.org.apache.maven.artifact.factory.ArtifactFactory}
- * @required
- * @readonly
+ * @component
*/
protected
svn commit: r731240 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Author: bentmann
Date: Sun Jan 4 04:33:01 2009
New Revision: 731240
URL: http://svn.apache.org/viewvc?rev=731240view=rev
Log:
o Avoided deprecated syntax
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=731240r1=731239r2=731240view=diff
==
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Sun Jan 4 04:33:01 2009
@@ -131,9 +131,7 @@
private String excludes;
/**
- * @parameter
expression=${component.org.apache.maven.scm.manager.ScmManager}
- * @required
- * @readonly
+ * @component
*/
private ScmManager manager;
svn commit: r731331 - in /maven/components/trunk: ./ maven-compat/ maven-core/ maven-distribution/ maven-embedder/ maven-lifecycle/ maven-mercury/ maven-model/ maven-plugin-api/ maven-project-builder/
Author: jvanzyl Date: Sun Jan 4 10:59:05 2009 New Revision: 731331 URL: http://svn.apache.org/viewvc?rev=731331view=rev Log: [maven-release-plugin] prepare release maven-3.0-alpha-1 Modified: maven/components/trunk/maven-compat/pom.xml maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-lifecycle/pom.xml maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-model/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-project-builder/pom.xml maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-reporting-api/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-compat/pom.xml (original) +++ maven/components/trunk/maven-compat/pom.xml Sun Jan 4 10:59:05 2009 @@ -12,7 +12,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-compat/artifactId Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Jan 4 10:59:05 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Sun Jan 4 10:59:05 2009 @@ -18,7 +18,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent artifactIdmaven-distribution/artifactId nameMaven Distribution/name Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Sun Jan 4 10:59:05 2009 @@ -13,7 +13,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent artifactIdmaven-embedder/artifactId nameMaven Embedder/name Modified: maven/components/trunk/maven-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-lifecycle/pom.xml (original) +++ maven/components/trunk/maven-lifecycle/pom.xml Sun Jan 4 10:59:05 2009 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-lifecycle/artifactId Modified: maven/components/trunk/maven-mercury/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-mercury/pom.xml (original) +++ maven/components/trunk/maven-mercury/pom.xml Sun Jan 4 10:59:05 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-SNAPSHOT/version +version3.0-alpha-1/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-mercury/artifactId Modified: maven/components/trunk/maven-model/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=731331r1=731330r2=731331view=diff == --- maven/components/trunk/maven-model/pom.xml (original) +++ maven/components/trunk/maven-model/pom.xml Sun
svn commit: r731333 - in /maven/components/trunk: ./ maven-compat/ maven-core/ maven-distribution/ maven-embedder/ maven-lifecycle/ maven-mercury/ maven-model/ maven-plugin-api/ maven-project-builder/
Author: jvanzyl Date: Sun Jan 4 10:59:28 2009 New Revision: 731333 URL: http://svn.apache.org/viewvc?rev=731333view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/trunk/maven-compat/pom.xml maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-lifecycle/pom.xml maven/components/trunk/maven-mercury/pom.xml maven/components/trunk/maven-model/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-project-builder/pom.xml maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-reporting-api/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-compat/pom.xml (original) +++ maven/components/trunk/maven-compat/pom.xml Sun Jan 4 10:59:28 2009 @@ -12,7 +12,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-compat/artifactId Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Jan 4 10:59:28 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Sun Jan 4 10:59:28 2009 @@ -18,7 +18,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-distribution/artifactId nameMaven Distribution/name Modified: maven/components/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-embedder/pom.xml (original) +++ maven/components/trunk/maven-embedder/pom.xml Sun Jan 4 10:59:28 2009 @@ -13,7 +13,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-embedder/artifactId nameMaven Embedder/name Modified: maven/components/trunk/maven-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-lifecycle/pom.xml (original) +++ maven/components/trunk/maven-lifecycle/pom.xml Sun Jan 4 10:59:28 2009 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-lifecycle/artifactId Modified: maven/components/trunk/maven-mercury/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-mercury/pom.xml (original) +++ maven/components/trunk/maven-mercury/pom.xml Sun Jan 4 10:59:28 2009 @@ -14,7 +14,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version3.0-alpha-1/version +version3.0-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-mercury/artifactId Modified: maven/components/trunk/maven-model/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=731333r1=731332r2=731333view=diff == --- maven/components/trunk/maven-model/pom.xml (original) +++
svn commit: r731332 - in /maven/components/tags/maven-3.0-alpha-1: ./ maven-compat/ maven-compat/src/main/java/org/apache/maven/settings/ maven-core/ maven-core/src/main/java/org/apache/maven/plugin/
Author: jvanzyl Date: Sun Jan 4 10:59:21 2009 New Revision: 731332 URL: http://svn.apache.org/viewvc?rev=731332view=rev Log: [maven-release-plugin] copy for tag maven-3.0-alpha-1 Added: maven/components/tags/maven-3.0-alpha-1/ (props changed) - copied from r731174, maven/components/trunk/ maven/components/tags/maven-3.0-alpha-1/maven-compat/compatibility.cfl - copied unchanged from r731276, maven/components/trunk/maven-compat/compatibility.cfl maven/components/tags/maven-3.0-alpha-1/maven-compat/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-compat/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java - copied unchanged from r731273, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java maven/components/tags/maven-3.0-alpha-1/maven-core/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-core/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java - copied unchanged from r731274, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java maven/components/tags/maven-3.0-alpha-1/maven-core/src/main/mdo/settings.mdo - copied unchanged from r731275, maven/components/trunk/maven-core/src/main/mdo/settings.mdo maven/components/tags/maven-3.0-alpha-1/maven-distribution/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-distribution/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-embedder/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-embedder/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-lifecycle/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-lifecycle/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-mercury/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-mercury/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-model/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-model/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-plugin-api/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-plugin-api/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-project-builder/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-project-builder/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-project/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-project/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-reporting-api/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-reporting-api/pom.xml maven/components/tags/maven-3.0-alpha-1/maven-toolchain/pom.xml - copied unchanged from r731331, maven/components/trunk/maven-toolchain/pom.xml maven/components/tags/maven-3.0-alpha-1/pom.xml - copied unchanged from r731331, maven/components/trunk/pom.xml Propchange: maven/components/tags/maven-3.0-alpha-1/ -- bugtraq:append = true Propchange: maven/components/tags/maven-3.0-alpha-1/ -- bugtraq:label = Enter issue ID: Propchange: maven/components/tags/maven-3.0-alpha-1/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/components/tags/maven-3.0-alpha-1/ -- bugtraq:number = false Propchange: maven/components/tags/maven-3.0-alpha-1/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/components/tags/maven-3.0-alpha-1/ -- --- svn:ignore (added) +++ svn:ignore Sun Jan 4 10:59:21 2009 @@ -0,0 +1,19 @@ +release.properties +deleteme.version.properties +bootstrap +maven.log +target +.classpath +.project +bootstrap.repo +maven-component.i* +.settings +mboot.jar +dummy +build.ajproperties +.generated.lst +*.iml +*.iws +*.ipr +log.txt +setup_env.sh Propchange: maven/components/tags/maven-3.0-alpha-1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 4 10:59:21 2009 @@ -0,0 +1,3 @@ +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/trunk:688587-696625,696644-699681 Propchange: maven/components/tags/maven-3.0-alpha-1/
svn commit: r731244 - /maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Author: bentmann
Date: Sun Jan 4 04:36:43 2009
New Revision: 731244
URL: http://svn.apache.org/viewvc?rev=731244view=rev
Log:
o Avoided deprecated syntax @parameter expression=${component...}
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java?rev=731244r1=731243r2=731244view=diff
==
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Sun Jan 4 04:36:43 2009
@@ -56,8 +56,7 @@
/**
* Doxia Site Renderer
*
- * @parameter
expression=${component.org.codehaus.doxia.site.renderer.SiteRenderer}
- * @required @readonly
+ * @component
*/
private SiteRenderer siteRenderer;
svn commit: r731354 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3955/
Author: bentmann
Date: Sun Jan 4 12:27:36 2009
New Revision: 731354
URL: http://svn.apache.org/viewvc?rev=731354view=rev
Log:
[MNG-3955] [regression] ${settings.localRepository} does not reflect actual
repo path if maven.repo.local used
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3955/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3955/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3955/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=731354r1=731353r2=731354view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Sun Jan 4 12:27:36 2009
@@ -90,6 +90,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng3955EffectiveSettingsTest.class );
suite.addTestSuite( MavenITmng3953AuthenticatedDeploymentTest.class );
suite.addTestSuite(
MavenITmng3948ParentResolutionFromProfileReposTest.class );
suite.addTestSuite(
MavenITmng3947PluginDefaultExecutionConfigTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java?rev=731354view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
Sun Jan 4 12:27:36 2009
@@ -0,0 +1,69 @@
+package org.apache.maven.it;
+
+/*
+ * 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 java.io.File;
+import java.util.Properties;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-3955;MNG-3955/a.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3955EffectiveSettingsTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng3955EffectiveSettingsTest()
+{
+super();
+}
+
+/**
+ * Test that plugin parameter expressions referring to the settings
reflect the actual core state, especially
+ * if settings have been overridden by CLI parameters.
+ */
+public void testitMNG3955()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-3955 );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.getCliOptions().add( --settings );
+verifier.getCliOptions().add( new File( testDir, settings.xml
).getAbsolutePath() );
+verifier.getCliOptions().add( --offline );
+verifier.getCliOptions().add( --batch-mode );
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+Properties props = verifier.loadProperties(
target/settings.properties );
+assertEquals(
