Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ limitations under the License.
<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>
Expand All @@ -82,6 +88,12 @@ 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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down