diff options
| author | Martin Schreier <martin_s@apache.org> | 2022-01-05 18:52:33 +0100 |
|---|---|---|
| committer | Martin Schreier <martin_s@apache.org> | 2022-01-05 18:52:33 +0100 |
| commit | 8c70e270b30ca79c702c576f8e9e0273a66f583c (patch) | |
| tree | cd5afec90e51f8e382b76e49af13219edaf7f5b5 | |
| parent | 31869b91d19f50f26052128d4a4afe9a2fb47970 (diff) | |
| download | archiva-8c70e270b30ca79c702c576f8e9e0273a66f583c.tar.gz archiva-8c70e270b30ca79c702c576f8e9e0273a66f583c.zip | |
Removing joda-time dependency
4 files changed, 10 insertions, 43 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 44d6fa531..c2a2a94bb 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -138,17 +138,6 @@ </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <scope>runtime</scope> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 426d86e93..8bb9fbb2f 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -212,10 +212,6 @@ <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java index ca996f526..19556f9f5 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java @@ -43,11 +43,13 @@ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; import org.apache.jackrabbit.webdav.property.DavPropertySet; import org.apache.jackrabbit.webdav.property.DefaultDavProperty; import org.apache.jackrabbit.webdav.property.ResourceType; -import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; -import java.util.*; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -351,9 +353,10 @@ public class ArchivaVirtualDavResource } // Need to get the ISO8601 date for properties - DateTime dt = new DateTime( 0 ); - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - String modifiedDate = fmt.print( dt ); + // DateTime dt = new DateTime( 0 ); + // DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + // String modifiedDate = fmt.print( dt ); + String modifiedDate = LocalDateTime.now( ).format( DateTimeFormatter.ISO_OFFSET_DATE_TIME ); properties.add( new DefaultDavProperty<>( DavPropertyName.GETLASTMODIFIED, modifiedDate ) ); @@ -960,17 +960,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>${commons.beanutils.version}</version> @@ -1541,11 +1530,6 @@ </dependency> <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>${joda.time.version}</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> @@ -1654,11 +1638,6 @@ </exclusions> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>${cglib.version}</version> - </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-model-converter</artifactId> <version>${maven-model-converter.version}</version> |