Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codehaus-plexus/plexus-xml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: plexus-xml-4.0.1
Choose a base ref
...
head repository: codehaus-plexus/plexus-xml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: plexus-xml-4.0.2
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 23, 2023

  1. [maven-release-plugin] prepare for next development iteration

    @gnodet
    gnodet committed Jun 23, 2023
    Copy the full SHA
    25a00cd View commit details

Commits on Jul 2, 2023

  1. Cleanup after parent pom upgrade

    @slachiewicz
    slachiewicz committed Jul 2, 2023
    Copy the full SHA
    a83cefa View commit details

Commits on Jul 3, 2023

  1. Upgrade to 4.0.0-alpha-7 and exclude dependency to sisu (fixes #17) (#23 

    )
    @gnodet
    gnodet authored Jul 3, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c3d99b4 View commit details

Commits on Jul 4, 2023

  1. [maven-release-plugin] prepare release plexus-xml-4.0.2

    @gnodet
    gnodet committed Jul 4, 2023
    Copy the full SHA
    944197c View commit details
Showing with 18 additions and 27 deletions.
  1. +16 −25 pom.xml
  2. +2 −2 src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
41 changes: 16 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ limitations under the License.
</parent>

<artifactId>plexus-xml</artifactId>
<version>4.0.1</version>
<version>4.0.2</version>

<name>Plexus XML Utilities</name>
<description>A collection of various utility classes to ease working with XML.</description>
@@ -33,7 +33,7 @@ limitations under the License.
<scm>
<connection>scm:git:https://github.com/codehaus-plexus/plexus-xml.git</connection>
<developerConnection>${project.scm.connection}</developerConnection>
<tag>plexus-xml-4.0.1</tag>
<tag>plexus-xml-4.0.2</tag>
<url>https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/</url>
</scm>
<issueManagement>
@@ -48,15 +48,20 @@ limitations under the License.
</distributionManagement>

<properties>
<project.build.outputTimestamp>2023-06-23T19:56:18Z</project.build.outputTimestamp>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2023-07-04T08:14:13Z</project.build.outputTimestamp>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
<version>4.0.0-alpha-5</version>
<version>4.0.0-alpha-7</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
@@ -73,7 +78,6 @@ limitations under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -82,18 +86,15 @@ limitations under the License.
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -119,16 +120,6 @@ limitations under the License.
<configuration>
<!-- required to ensure the test classes are used, not surefire's plexus-utils -->
<childDelegation>true</childDelegation>
<systemPropertyVariables>
<property>
<name>JAVA_HOME</name>
<value>${JAVA_HOME}</value>
</property>
<property>
<name>M2_HOME</name>
<value>${M2_HOME}</value>
</property>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
4 changes: 2 additions & 2 deletions src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
View file
Original file line number Diff line number Diff line change
@@ -125,15 +125,15 @@ public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) {
}

/**
* @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isNotEmpty(String)} instead
* @deprecated Use org.codehaus.plexus.util.StringUtils#isNotEmpty(String) instead
*/
@Deprecated
public static boolean isNotEmpty(String str) {
return (str != null && str.length() > 0);
}

/**
* @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isEmpty(String)} instead
* @deprecated Use org.codehaus.plexus.util.StringUtils#isEmpty(String) instead
*/
@Deprecated
public static boolean isEmpty(String str) {