Permalink
Browse files

We have tests, run them before pushing....

  • Loading branch information...
1 parent 8779fbd commit fa655497a473c2582c8a9aa3f89145d1f106133a @krosenvold krosenvold committed Aug 6, 2013
Showing with 122 additions and 8 deletions.
  1. +2 −2 pom.xml
  2. +94 −0 pom.xml.releaseBackup
  3. +18 −0 release.properties
  4. +8 −6 src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
View
@@ -26,7 +26,7 @@ limitations under the License.
</parent>
<artifactId>plexus-utils</artifactId>
- <version>3.0.14-SNAPSHOT</version>
+ <version>3.0.14</version>
<name>Plexus Common Utilities</name>
<description>A collection of various utility classes to ease working with strings, files, command lines, XML and
@@ -38,7 +38,7 @@ limitations under the License.
<connection>scm:git:git@github.com:sonatype/plexus-utils.git</connection>
<developerConnection>scm:git:git@github.com:sonatype/plexus-utils.git</developerConnection>
<url>http://github.com/sonatype/plexus-utils</url>
- <tag>HEAD</tag>
+ <tag>plexus-utils-3.0.14</tag>
</scm>
<issueManagement>
<system>JIRA</system>
View
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright The Codehaus Foundation.
+
+Licensed 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 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>3.3.1</version>
+ </parent>
+
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.14-SNAPSHOT</version>
+
+ <name>Plexus Common Utilities</name>
+ <description>A collection of various utility classes to ease working with strings, files, command lines, XML and
+ more.
+ </description>
+ <url>http://plexus.codehaus.org/plexus-utils</url>
+
+ <scm>
+ <connection>scm:git:git@github.com:sonatype/plexus-utils.git</connection>
+ <developerConnection>scm:git:git@github.com:sonatype/plexus-utils.git</developerConnection>
+ <url>http://github.com/sonatype/plexus-utils</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/PLXUTILS</url>
+ </issueManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- required to ensure the test classes are used, not surefire's plexus-utils -->
+ <childDelegation>true</childDelegation>
+ <excludes>
+ <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>JAVA_HOME</name>
+ <value>${JAVA_HOME}</value>
+ </property>
+ <property>
+ <name>M2_HOME</name>
+ <value>${M2_HOME}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.7.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
@@ -0,0 +1,18 @@
+#release configuration
+#Tue Aug 06 21:40:26 CEST 2013
+project.scm.org.codehaus.plexus\:plexus-utils.tag=HEAD
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+scm.tag=plexus-utils-3.0.14
+project.scm.org.codehaus.plexus\:plexus-utils.url=http\://github.com/sonatype/plexus-utils
+pushChanges=true
+scm.url=scm\:git\:git@github.com\:sonatype/plexus-utils.git
+preparationGoals=clean verify
+project.scm.org.codehaus.plexus\:plexus-utils.developerConnection=scm\:git\:git@github.com\:sonatype/plexus-utils.git
+project.scm.org.codehaus.plexus\:plexus-utils.connection=scm\:git\:git@github.com\:sonatype/plexus-utils.git
+project.rel.org.codehaus.plexus\:plexus-utils=3.0.14
+project.dev.org.codehaus.plexus\:plexus-utils=3.0.15-SNAPSHOT
+remoteTagging=true
+scm.commentPrefix=[maven-release-plugin]
+exec.additionalArguments=-Pplexus-release
+exec.snapshotReleasePluginAllowed=false
+completedPhase=generate-release-poms
@@ -224,16 +224,18 @@ private static String escapeXml( String text )
text = gt.matcher( text ).replaceAll( "&gt;" );
}
if (text.indexOf('"') >= 0){
- text = dqoute.matcher( text ).replaceAll( "\"" );
+ text = dqoute.matcher( text ).replaceAll( "&quot;" );
}
if (text.indexOf('\'') >= 0){
- text = sqoute.matcher( text ).replaceAll( "\'" );
+ text = sqoute.matcher( text ).replaceAll( "&apos;" );
}
return text;
}
- private static final Pattern crlf = Pattern.compile( "\r\n" );
+ private static final String crlf_str = "\r\n";
+
+ private static final Pattern crlf = Pattern.compile( crlf_str );
private static final Pattern lowers = Pattern.compile( "([\000-\037])" );
@@ -242,10 +244,10 @@ private static String escapeXmlAttribute( String text )
text = escapeXml( text );
// Windows
- Matcher matcher = crlf.matcher( text );
- if (matcher.matches())
+ Matcher crlfmatcher = crlf.matcher( text );
+ if (text.contains( crlf_str ))
{
- text = matcher.replaceAll( "&#10;" );
+ text = crlfmatcher.replaceAll( "&#10;" );
}
Matcher m = lowers.matcher( text );

0 comments on commit fa65549

Please sign in to comment.