diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-06 11:36:45 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-07 17:28:24 -0800 |
| commit | 2218301988eec2fd882151ed31ed7699cfc04307 (patch) | |
| tree | 558e0b080bf7af55b2e8541a11bfb9c819ab3520 /build.xml | |
| parent | 2374fcb194e62ab185926d411921dedeb57ad150 (diff) | |
| download | scala-2218301988eec2fd882151ed31ed7699cfc04307.tar.gz scala-2218301988eec2fd882151ed31ed7699cfc04307.tar.bz2 scala-2218301988eec2fd882151ed31ed7699cfc04307.zip | |
Extra repository hook via `extra.repo.url` var
Previously defaulted to 'https://oss.sonatype.org/content/repositories/releases',
now must be set manually. PR validation uses it to configure the repository
that has the artifacts published during validation.
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -269,7 +269,7 @@ TODO: </artifact:dependencies> - <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/> + <artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/> <artifact:dependencies pathId="partest.classpath" filesetId="partest.fileset" versionsId="partest.versions"> <!-- uncomment the following if you're deploying your own partest locally --> @@ -277,7 +277,7 @@ TODO: <!-- so we don't have to wait for artifacts to synch to maven central (we don't distribute partest with Scala, so the risk of sonatype and maven being out of synch is irrelevant): --> - <artifact:remoteRepository refid="sonatype-release"/> + <artifact:remoteRepository refid="extra-repo"/> <dependency groupId="org.scala-lang.modules" artifactId="scala-partest_${scala.binary.version}" version="${partest.version.number}" /> </artifact:dependencies> <copy-deps project="partest"/> @@ -290,8 +290,7 @@ TODO: <!-- used by the test.osgi target to create osgi bundles for the xml, parser-combinator jars must specify sourcesFilesetId, javadocFilesetId to download these types of artifacts --> <artifact:dependencies pathId="external-modules.deps.classpath" sourcesFilesetId="external-modules.sources.fileset" javadocFilesetId="external-modules.javadoc.fileset"> - <!-- sonatype is not enabled by default for modules to avoid a Scala release relying on a JAR that's not on maven (yet) --> - <!-- <artifact:remoteRepository refid="sonatype-release"/> --> + <artifact:remoteRepository refid="extra-repo"/> <dependency groupId="org.scala-lang.modules" artifactId="scala-xml_${scala.binary.version}" version="${scala-xml.version.number}"/> <dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators_${scala.binary.version}" version="${scala-parser-combinators.version.number}"/> </artifact:dependencies> @@ -363,6 +362,7 @@ TODO: <if><isset property="starr.use.released"/><then> <echo message="Using Scala ${starr.version} for STARR."/> <artifact:dependencies pathId="starr.core.path"> + <artifact:remoteRepository refid="extra-repo"/> <dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/> <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/> <dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/> |