You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/03 13:56:25 UTC
[maven-assembly-plugin] branch master updated: [MASSEMBLY-935] fix
JDOM dependencies (#19)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 69d6b66 [MASSEMBLY-935] fix JDOM dependencies (#19)
69d6b66 is described below
commit 69d6b66326dad57c464b2dc7be66be597e30ad33
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Sun May 3 09:56:18 2020 -0400
[MASSEMBLY-935] fix JDOM dependencies (#19)
* clarify test dependencies
* detab
---
pom.xml | 21 +++++++++------------
.../filter/ComponentsXmlArchiverFileFilterTest.java | 2 +-
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index a94a71f..b8ec790 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,9 @@ 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">
+<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>
@@ -205,23 +207,18 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
+ <version>1.1.3</version>
<scope>test</scope>
</dependency>
+ <!-- need this because JDOM incorrectly declares its own dependencies -->
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.0-FCS</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>saxpath</groupId>
- <artifactId>saxpath</artifactId>
- <version>1.0-FCS</version>
- <scope>test</scope>
- </dependency>
+ <version>1.2.0</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
index 26954ce..ea8ea07 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
@@ -65,7 +65,7 @@ import java.util.zip.ZipFile;
public class ComponentsXmlArchiverFileFilterTest
{
-// private final TestFileManager fileManager = new TestFileManager( "componentsXmlArchiverFileFilter.test", ".zip" );
+
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();