can someone expert in release plugin review this commit? I had to upgrade the dependency and fix expected POM files: I don't see any problem in the new POM content, but I prefer to ask for review
If it is ok, I'll be able to merge the changes from branch back to trunk and close MRELEASE-87. Hervé Le samedi 03 novembre 2007, [EMAIL PROTECTED] a écrit : > Author: hboutemy > Date: Sat Nov 3 15:40:09 2007 > New Revision: 591703 > > URL: http://svn.apache.org/viewvc?rev=591703&view=rev > Log: > [MRELEASE-87] upgrade maven-project dependency to 2.0.8-SNAPSHOT to get > encoding support when building a project > > Modified: > > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.md5 > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.sha1 > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom-with >-schema.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/external-range-dependency/expected- >release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-depende >ncies/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-depende >ncies/subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-depende >ncies/subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-extensi >on/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-extensi >on/subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-extensi >on/subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-plugins >/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-plugins >/subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-plugins >/subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-report- >plugins/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-report- >plugins/subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-report- >plugins/subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-dependenc >y/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-dependenc >y/subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-dependenc >y/subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-dependenc >y/subproject3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-plugin/ex >pected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-plugin/su >bproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-plugin/su >bproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-managed-snapshot-plugin/su >bproject3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/expe >cted-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/subp >roject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/subp >roject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/subp >roject3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/subp >roject4/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-dependencies/subp >roject4/subsubproject/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-extension/expecte >d-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-extension/subproj >ect1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-extension/subproj >ect2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-extension/subproj >ect3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-plugins/expected- >release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-plugins/subprojec >t1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-plugins/subprojec >t2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-plugins/subprojec >t3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-plugins/subprojec >t4/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-range-dependency/ >expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-range-dependency/ >subproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-range-dependency/ >subproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-report-plugins/ex >pected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-report-plugins/su >bproject1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-report-plugins/su >bproject2/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-report-plugins/su >bproject3/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-snapshot-report-plugins/su >bproject4/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-inherited-version/expected >-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-inherited-version/subproje >ct1/expected-release-pom-version-changed.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-inherited-version/subproje >ct1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-namespace/expected-release >-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-namespace/subproject1/expe >cted-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-namespace/subproject2/expe >cted-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-parent/expected-release-po >m.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-parent/subproject1/expecte >d-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-released-parent/expected-r >elease-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-with-released-parent/subproject >1/expected-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/pom-without-extension-version/expec >ted-release-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected- >pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-development/basic-pom-inherited-scm/subprojec >t1/expected-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-development/basic-pom-inherited-scm/subprojec >t1/pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom. >xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/e >xpected-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/p >om.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/pom-with-overridden-scm/subproject1/e >xpected-pom.xml > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/rewrite-for-release/pom-with-overridden-scm/subproject1/p >om.xml > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/pom.xml > URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/pom.xml?rev=591703&r1=591702&r2=591703&view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/pom.xml > (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/pom.xml > Sat Nov 3 15:40:09 2007 @@ -57,22 +57,22 @@ > <dependency> > <groupId>org.apache.maven</groupId> > <artifactId>maven-model</artifactId> > - <version>2.0</version> > + <version>2.0.8-SNAPSHOT</version> > </dependency> > <dependency> > <groupId>org.apache.maven</groupId> > <artifactId>maven-artifact</artifactId> > - <version>2.0</version> > + <version>2.0.8-SNAPSHOT</version> > </dependency> > <dependency> > <groupId>org.apache.maven</groupId> > <artifactId>maven-project</artifactId> > - <version>2.0</version> > + <version>2.0.8-SNAPSHOT</version> > </dependency> > <dependency> > <groupId>org.apache.maven</groupId> > <artifactId>maven-settings</artifactId> > - <version>2.0</version> > + <version>2.0.8-SNAPSHOT</version> > </dependency> > > <dependency> > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/remote-repository/external/parent-artifactId/1/ >parent-artifactId-1.pom?rev=591703&r1=591702&r2=591703&view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom > (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom Sat > Nov 3 15:40:09 2007 @@ -23,6 +23,7 @@ > <groupId>external</groupId> > <artifactId>parent-artifactId</artifactId> > <version>1</version> > + <packaging>pom</packaging> > <description>POM was created from deploy:deploy-file</description> > <scm> > <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection> > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.md5 > URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/remote-repository/external/parent-artifactId/1/ >parent-artifactId-1.pom.md5?rev=591703&r1=591702&r2=591703&view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.md5 > (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.md5 > Sat Nov 3 15:40:09 2007 @@ -1 +1 @@ > -e285fcfc912497c288753c21a7f898d7 *parent-artifactId-1.pom > +dc86dd9085c8cf336b6b5a4630ece788 *parent-artifactId-1.pom > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.sha1 > URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/remote-repository/external/parent-artifactId/1/ >parent-artifactId-1.pom.sha1?rev=591703&r1=591702&r2=591703&view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.sha1 > (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom.sha1 > Sat Nov 3 15:40:09 2007 @@ -1 +1 @@ > -539c7123c8ae3d747b5afe39d4d2c0111d294f00 *parent-artifactId-1.pom > +057af012b5f3a4b14396ad9d954ab14290f176e8 *parent-artifactId-1.pom > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom-with >-schema.xml URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/resources/projects/generate-release-poms/basic- >pom/expected-release-pom-with-schema.xml?rev=591703&r1=591702&r2=591703&view >=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom-with >-schema.xml (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom-with >-schema.xml Sat Nov 3 15:40:09 2007 @@ -1,4 +1,4 @@ > -<project> > +<?xml version="1.0" encoding="UTF-8"?><project> > <modelVersion>4.0.0</modelVersion> > <groupId>groupId</groupId> > <artifactId>artifactId</artifactId> > @@ -34,12 +34,15 @@ > </repositories> > <pluginRepositories> > <pluginRepository> > + <releases> > + <updatePolicy>never</updatePolicy> > + </releases> > <snapshots> > <enabled>false</enabled> > </snapshots> > <id>central</id> > <name>Maven Plugin Repository</name> > - <url>http://www.ibiblio.org/maven2</url> > + <url>http://repo1.maven.org/maven2</url> > </pluginRepository> > </pluginRepositories> > <reporting> > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml > URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/resources/projects/generate-release-poms/basic- >pom/expected-release-pom.xml?rev=591703&r1=591702&r2=591703&view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml > (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml > Sat Nov 3 15:40:09 2007 @@ -1,4 +1,4 @@ > -<project> > +<?xml version="1.0" encoding="UTF-8"?><project> > <modelVersion>4.0.0</modelVersion> > <groupId>groupId</groupId> > <artifactId>artifactId</artifactId> > @@ -34,12 +34,15 @@ > </repositories> > <pluginRepositories> > <pluginRepository> > + <releases> > + <updatePolicy>never</updatePolicy> > + </releases> > <snapshots> > <enabled>false</enabled> > </snapshots> > <id>central</id> > <name>Maven Plugin Repository</name> > - <url>http://www.ibiblio.org/maven2</url> > + <url>http://repo1.maven.org/maven2</url> > </pluginRepository> > </pluginRepositories> > <reporting> > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/external-range-dependency/expected- >release-pom.xml URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/resources/projects/generate-release-poms/extern >al-range-dependency/expected-release-pom.xml?rev=591703&r1=591702&r2=591703& >view=diff > =========================================================================== >=== --- > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/external-range-dependency/expected- >release-pom.xml (original) +++ > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/external-range-dependency/expected- >release-pom.xml Sat Nov 3 15:40:09 2007 @@ -1,4 +1,4 @@ > -<project> > +<?xml version="1.0" encoding="UTF-8"?><project> > <modelVersion>4.0.0</modelVersion> > <groupId>groupId</groupId> > <artifactId>artifactId</artifactId> > @@ -34,12 +34,15 @@ > </repositories> > <pluginRepositories> > <pluginRepository> > + <releases> > + <updatePolicy>never</updatePolicy> > + </releases> > <snapshots> > <enabled>false</enabled> > </snapshots> > <id>central</id> > <name>Maven Plugin Repository</name> > - <url>http://www.ibiblio.org/maven2</url> > + <url>http://repo1.maven.org/maven2</url> > </pluginRepository> > </pluginRepositories> > <dependencies> > > Modified: > maven/release/branches/MRELEASE-87_encoding/maven-release-manager/src/test/ >resources/projects/generate-release-poms/internal-differing-snapshot-depende >ncies/expected-release-pom.xml URL: > http://svn.apache.org/viewvc/maven/release/branches/MRELEASE-87_encoding/ma >ven-release-manager/src/test/resources/projects/generate-release-poms/intern >al-differing-snapshot-dependencies/expected-release-pom.xml?rev=591703&r1=59 >1702&r2=591703&view=diff [SNAP] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
