diff options
| author | Martin Schreier <martin_s@apache.org> | 2022-01-05 21:00:36 +0100 |
|---|---|---|
| committer | Martin Schreier <martin_s@apache.org> | 2022-01-05 21:00:36 +0100 |
| commit | 468c99b295c4dd4517dc9b6d9f261bb63909b5ee (patch) | |
| tree | a19c290f79c8085cd60818f0c1b355263a9856a0 | |
| parent | 8c70e270b30ca79c702c576f8e9e0273a66f583c (diff) | |
| download | archiva-468c99b295c4dd4517dc9b6d9f261bb63909b5ee.tar.gz archiva-468c99b295c4dd4517dc9b6d9f261bb63909b5ee.zip | |
Updating assertj version
6 files changed, 8 insertions, 8 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 752e88dac..3502aa3ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -232,7 +232,7 @@ </dependency> <dependency> <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj</artifactId> + <artifactId>xmlunit-assertj3</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java index 0a50b3043..2a60d710c 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; -import org.xmlunit.assertj.XmlAssert; +import org.xmlunit.assertj3.XmlAssert; import javax.inject.Inject; import java.nio.charset.Charset; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java index e4f42d8ad..209d050d3 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java @@ -37,7 +37,7 @@ import org.mockito.ArgumentCaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.context.ContextConfiguration; -import org.xmlunit.assertj.XmlAssert; +import org.xmlunit.assertj3.XmlAssert; import java.io.IOException; import java.nio.charset.Charset; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index a065afd01..f415c77e3 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -273,7 +273,7 @@ </dependency> <dependency> <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj</artifactId> + <artifactId>xmlunit-assertj3</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java index dfe46ed92..d1cd94df7 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java @@ -24,7 +24,7 @@ import org.apache.archiva.repository.metadata.base.RepositoryMetadataWriter; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; -import org.xmlunit.assertj.XmlAssert; +import org.xmlunit.assertj3.XmlAssert; import java.io.StringWriter; import java.net.URISyntaxException; @@ -82,7 +82,7 @@ <derbyVersion>10.13.1.1</derbyVersion> <httpclient.version>4.5.13</httpclient.version> - <httpclient.core.version>4.4.14</httpclient.core.version> + <httpclient.core.version>4.4.15</httpclient.core.version> <openjpaVersion>3.1.1</openjpaVersion> @@ -1524,7 +1524,7 @@ </dependency> <dependency> <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj</artifactId> + <artifactId>xmlunit-assertj3</artifactId> <version>${xmlunit.version}</version> <scope>test</scope> </dependency> @@ -1704,7 +1704,7 @@ <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.13.2</version> + <version>${assertj.version}</version> <scope>test</scope> <exclusions> <exclusion> |