From 1566058227f3967d97f1c69d5c4f21bcf70138de Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 20:00:10 -0400 Subject: [PATCH 1/3] Deprecate JavaNet1Repository. #1541 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t think there’s an alternative for java.net Maven 1 repository. --- ivy/src/main/scala/sbt/ConvertResolver.scala | 2 ++ ivy/src/main/scala/sbt/Resolver.scala | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ivy/src/main/scala/sbt/ConvertResolver.scala b/ivy/src/main/scala/sbt/ConvertResolver.scala index a36d7430c..8097ae5b9 100644 --- a/ivy/src/main/scala/sbt/ConvertResolver.scala +++ b/ivy/src/main/scala/sbt/ConvertResolver.scala @@ -112,6 +112,8 @@ private object ConvertResolver { resolver.setPatterns() // has to be done after initializeMavenStyle, which calls methods that overwrite the patterns resolver } + // TODO: HTTP repository is no longer recommended. #1541 + // Remove `JavaNet1Repository` when we bump up the API. case r: JavaNet1Repository => { // Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy: diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 52fbf0fb8..9c98fc0fa 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -138,7 +138,9 @@ import Resolver._ object DefaultMavenRepository extends MavenRepository("public", centralRepositoryRoot(useSecureResolvers)) object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot) object JCenterRepository extends MavenRepository(JCenterRepositoryName, JCenterRepositoryRoot) +@deprecated("HTTP repository is no longer recommended.", "0.13.6") object JavaNet1Repository extends JavaNet1Repository +@deprecated("HTTP repository is no longer recommended.", "0.13.6") sealed trait JavaNet1Repository extends Resolver { def name = "java.net Maven1 Repository" } From d86e6ccd2608866f1163c7b845d9ba2d2055e41a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 20:13:51 -0400 Subject: [PATCH 2/3] Fixes #1549. Use HTTPS for Java.net Maven 2 repository --- ivy/src/main/scala/sbt/Resolver.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 9c98fc0fa..b0971950c 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -152,11 +152,16 @@ object Resolver { val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" val JavaNet2RepositoryName = "java.net Maven2 Repository" - val JavaNet2RepositoryRoot = "http://download.java.net/maven/2" + val JavaNet2RepositoryRoot = javanet2RepositoryRoot(useSecureResolvers) val JCenterRepositoryName = "jcenter" val JCenterRepositoryRoot = "https://jcenter.bintray.com/" val DefaultMavenRepositoryRoot = "https://repo1.maven.org/maven2/" + // TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future. private[sbt] def centralRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo1.maven.org/maven2/" + // TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future. + private[sbt] def javanet2RepositoryRoot(secure: Boolean) = + if (secure) "https://maven.java.net/content/repositories/public/" + else "http://download.java.net/maven/2" // obsolete: kept only for launcher compatibility private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases" From 090e3a64680aed8c8a5dd47589b5f7be244cf0e6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 20:27:23 -0400 Subject: [PATCH 3/3] #1541. Use HTTPS for Typesafe repository --- ivy/src/main/scala/sbt/Resolver.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index b0971950c..4ff1f10f0 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -148,7 +148,7 @@ sealed trait JavaNet1Repository extends Resolver { object Resolver { private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true - val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe" + val TypesafeRepositoryRoot = typesafeRepositoryRoot(useSecureResolvers) val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" val JavaNet2RepositoryName = "java.net Maven2 Repository" @@ -162,6 +162,8 @@ object Resolver { private[sbt] def javanet2RepositoryRoot(secure: Boolean) = if (secure) "https://maven.java.net/content/repositories/public/" else "http://download.java.net/maven/2" + // TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future. + private[sbt] def typesafeRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo.typesafe.com/typesafe" // obsolete: kept only for launcher compatibility private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases"