diff --git a/ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala index 7bc878b2b..202216700 100644 --- a/ivy/src/main/scala/sbt/CustomPomParser.scala +++ b/ivy/src/main/scala/sbt/CustomPomParser.scala @@ -54,7 +54,8 @@ object CustomPomParser { lazy val registerDefault: Unit = ModuleDescriptorParserRegistry.getInstance.addParser(default) def defaultTransform(parser: ModuleDescriptorParser, md: ModuleDescriptor): ModuleDescriptor = - if (transformedByThisVersion(md)) md else defaultTransformImpl(parser, md) + if (transformedByThisVersion(md)) md + else defaultTransformImpl(parser, md) private[this] def transformedByThisVersion(md: ModuleDescriptor): Boolean = { diff --git a/ivy/src/main/scala/sbt/ivyint/SbtChainResolver.scala b/ivy/src/main/scala/sbt/ivyint/SbtChainResolver.scala index 685431124..9a2b483aa 100644 --- a/ivy/src/main/scala/sbt/ivyint/SbtChainResolver.scala +++ b/ivy/src/main/scala/sbt/ivyint/SbtChainResolver.scala @@ -7,7 +7,7 @@ import java.util.Date import org.apache.ivy.core.settings.IvySettings import org.apache.ivy.core.{ IvyContext, LogOptions } -import org.apache.ivy.core.module.descriptor.{ ModuleDescriptor, DependencyDescriptor, Artifact => IArtifact } +import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact, DefaultModuleDescriptor, DefaultDependencyDescriptor, ModuleDescriptor, DependencyDescriptor } import org.apache.ivy.core.resolve.{ ResolvedModuleRevision, ResolveData } import org.apache.ivy.plugins.latest.LatestStrategy import org.apache.ivy.plugins.repository.file.{ FileRepository => IFileRepository, FileResource } @@ -94,6 +94,23 @@ class SbtChainResolver(name: String, resolvers: Seq[DependencyResolver], setting } else temp map { x => (forcedRevision(x), resolver) } ) + retval match { + case Right(Some((rmr, _))) => + rmr.getDescriptor.getPublicationDate match { + case null => + val ivf = resolver.findIvyFileRef(dd, data) + val lmd = new java.util.Date(ivf.getLastModified) + rmr.getDescriptor match { + case dmd: DefaultModuleDescriptor => + Message.info(s"Getting null publication date from resolver: ${resolver} for ${rmr.getId}, setting to: ${lmd}") + dmd.setPublicationDate(lmd) + case _ => + Message.warn(s"Getting null publication date from resolver: ${resolver} for ${rmr.getId}, resolution order is undefined!") + } + case _ => // All other cases ok + } + case _ => + } retval } catch { case ex: Exception => @@ -111,7 +128,10 @@ class SbtChainResolver(name: String, resolvers: Seq[DependencyResolver], setting val sorted = if (useLatest) (foundRevisions.sortBy { case (rmr, _) => - rmr.getDescriptor.getPublicationDate.getTime + rmr.getDescriptor.getPublicationDate match { + case null => 0L + case d => d.getTime + } }).reverse.headOption map { case (rmr, resolver) => // Now that we know the real latest revision, let's force Ivy to use it