You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/11/01 16:15:34 UTC
svn commit: r591045 - in /maven/plugins/trunk/maven-deploy-plugin: ./
src/main/java/org/apache/maven/plugin/deploy/ src/main/java/org/codehaus/
src/test/resources/unit/basic-deploy-test/
src/test/resources/unit/deploy-file-pom-file/
Author: hboutemy
Date: Thu Nov 1 08:15:33 2007
New Revision: 591045
URL: http://svn.apache.org/viewvc?rev=591045&view=rev
Log:
[MDEPLOY-66] add XML encoding support for POM reading/writing
Added:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/codehaus/
- copied from r590475, maven/plugins/trunk/maven-install-plugin/src/main/java/org/codehaus/
Modified:
maven/plugins/trunk/maven-deploy-plugin/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml (contents, props changed)
Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=591045&r1=591044&r2=591045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Thu Nov 1 08:15:33 2007
@@ -21,33 +21,33 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
+ <version>2.4-SNAPSHOT</version>
<scope>test</scope>
- <version>1.0-beta-1</version>
</dependency>
</dependencies>
</project>
Modified: maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=591045&r1=591044&r2=591045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java Thu Nov 1 08:15:33 2007
@@ -33,15 +33,13 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
@@ -304,8 +302,7 @@
Reader reader = null;
try
{
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is upgraded to 1.4.5+
- reader = new InputStreamReader( new FileInputStream( pomFile ), "UTF-8" );
+ reader = ReaderFactory.newXmlReader( pomFile );
MavenXpp3Reader modelReader = new MavenXpp3Reader();
return modelReader.read( reader );
}
@@ -344,8 +341,7 @@
model.setPackaging( packaging );
model.setDescription( description );
- // TODO use WriterFactory.newXmlWriter() when plexus-utils is upgraded to 1.4.5+
- fw = new OutputStreamWriter( new FileOutputStream( tempFile ), "UTF-8" );
+ fw = WriterFactory.newXmlWriter( tempFile );
new MavenXpp3Writer().write( fw, model );
return tempFile;
Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml?rev=591045&r1=591044&r2=591045&view=diff
==============================================================================
Binary files - no diff available.
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
('svn:eol-style' removed)
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml?rev=591045&r1=591044&r2=591045&view=diff
==============================================================================
Binary files - no diff available.
Propchange: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream