From a24e7fa688cad6bd12d8541a76b5e0b04291a070 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Sat, 9 Nov 2013 12:53:10 -0800
Subject: M6 modules, partest depends on scala as provided.

The new partest now marks its scala dependencies as provided.
This is much more robust than before, and it breaks ugly cycles.

Updated the build for partest-extras to provide the required
scala-compiler dependency.

Also, upgrade pax-url-aether to 1.6.0.

Since our jenkins uses mirrors with passwords,
we needed a fix for https://ops4j1.jira.com/browse/PAXURL-217
in order to run osgi.test on jenkins, now that we use maven more.
We didn't hit this bug before because we were using a standard
location for the maven local repository, but that causes problems
with concurrent jenkins jobs accessing it.

So, I added the following to `~/.m2/settings`,
and then ran into the issue described above.

Also removed some non-essential uses of the extra-repo (slows stuff down),
and added a comment of how to make the osgi tests look in a certain
local m2 repo (for /some/ operations...)

```
<!--
  Maven repos are not safe for concurrent access, thus give each job its own.
  The WORKSPACE env var is set by jenkins to the path of the current job's workspace.
  This settings file will cause ant/maven to break if WORKSPACE is not set (to a writeable directory).
  I don't know how to encode a fall back, but I assume it's not needed as this is ~jenkins/.m2/settings.xml
-->
<localRepository>${WORKSPACE}/m2repo</localRepository>
```
---
 build.xml                           | 47 ++++++++++++-------------------------
 test/osgi/src/ScalaOsgiHelper.scala |  2 ++
 versions.properties                 | 12 ++++++----
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/build.xml b/build.xml
index f37a6e6065..e2d7fc21a0 100755
--- a/build.xml
+++ b/build.xml
@@ -260,12 +260,14 @@ TODO:
       <copy-deps project="junit"/>
 
       <!-- Pax runner -->
-      <property name="pax.exam.version" value="2.5.0"/>
+      <property name="pax.exam.version" value="2.6.0"/>
       <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
-        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/>
+        <!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
+      https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
+        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
         <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
         <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
         <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
@@ -282,8 +284,9 @@ 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="extra-repo"/>
+        <!-- <artifact:remoteRepository refid="extra-repo"/> -->
         <dependency groupId="org.scala-lang.modules" artifactId="scala-partest_${scala.binary.version}" version="${partest.version.number}" />
+        <dependency groupId="org.scalacheck"         artifactId="scalacheck_${scala.binary.version}"    version="${scalacheck.version.number}" />
       </artifact:dependencies>
       <copy-deps project="partest"/>
 
@@ -295,7 +298,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">
-        <artifact:remoteRepository refid="extra-repo"/>
+        <!-- <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>
@@ -313,25 +316,6 @@ TODO:
       </path>
       <copy-deps refid="external-modules-nocore" project="scaladoc"/>
 
-      <!--
-        include partest and its run-time dependencies,
-        but filter out the compiler we just built, as that's what we want to test!
-        TODO: mark partest's compiler dependencies as provided when publishing to maven,
-        so that we don't have to filter them out here...
-      -->
-      <path id="partest-deps-nocore">
-        <restrict>
-          <path refid="partest.classpath"/>
-          <rsel:not><rsel:or>
-            <rsel:name name="scala-library*.jar"/>
-            <rsel:name name="scala-reflect*.jar"/>
-            <rsel:name name="scala-compiler*.jar"/>
-            <!-- TODO: remove actors & scalap, move to external modules -->
-            <rsel:name name="scala-actors*.jar"/>
-            <rsel:name name="scala-scalap*.jar"/>
-          </rsel:or></rsel:not>
-        </restrict>
-      </path>
 
       <!-- Set property named @{name} to the jar resolved as @{jar}_${scala.binary.version}:jar.
            @{jar}_${scala.binary.version} must be a maven dependency. -->
@@ -760,13 +744,13 @@ TODO:
     <path id="quick.partest-extras.build.path">
       <path refid="asm.classpath"/>
       <path refid="partest.classpath"/>
+      <path refid="quick.compiler.build.path"/>
       <pathelement location="${build-quick.dir}/classes/repl"/>
       <!-- for the java dependency: Profiler.java -->
       <pathelement location="${build-quick.dir}/classes/partest-extras"/>
     </path>
 
     <path id="quick.partest-javaagent.build.path">
-      <path refid="partest.classpath"/>
       <path refid="asm.classpath"/>
     </path>
 
@@ -905,18 +889,16 @@ TODO:
       <pathelement location="${reflect.jar}"/>
       <pathelement location="${compiler.jar}"/>
 
-      <!-- to test a quick build without packing, replace the above pathelements with:        (may need a little tweaking)
-      <path refid="quick.bin.tool.path">
-      <path refid="quick.interactive.build.path">
-      -->
-
       <!-- TODO: move scalap & actors out of repo -->
       <pathelement location="${scalap.jar}"/>
       <pathelement location="${actors.jar}"/>
 
-      <!-- partest dependencies, without the jars we built locally
-           TODO: figure out why scalap tests fail if we move this up-->
-      <path refid="partest-deps-nocore"/>
+      <!-- partest's dependencies, which marks most of its dependencies as provided,
+           so we provide them: scala-[library/reflect/compiler], scalap built here,
+           scala-xml, scala-parser-combinators via external-modules-nocore,
+           scalacheck as part of `partest.classpath` -->
+      <path refid="partest.classpath"/>
+      <path refid="external-modules-nocore"/> <!-- xml, parsers -->
 
       <!-- partest classes specific to the core compiler build -->
       <pathelement location="${partest-extras.jar}"/>
@@ -1807,6 +1789,7 @@ TODO:
   <target name="test.suite.init" depends="partest.task">
     <!-- read by test/partest to determine classpath used to run partest -->
     <propertyfile file = "build/pack/partest.properties">
+      <!-- TODO: change "partest.classpath" to "partest.runtime.classpath" or something -->
       <entry key       = "partest.classpath" value="${toString:partest.compilation.path}"/>
     </propertyfile>
   </target>
diff --git a/test/osgi/src/ScalaOsgiHelper.scala b/test/osgi/src/ScalaOsgiHelper.scala
index bcdc5c0df1..7b14cf20e8 100644
--- a/test/osgi/src/ScalaOsgiHelper.scala
+++ b/test/osgi/src/ScalaOsgiHelper.scala
@@ -21,6 +21,8 @@ trait ScalaOsgiHelper {
   def standardOptions: Array[exam.Option]  = {
     val bundles = (allBundleFiles map makeBundle)
     bundles ++ Array[exam.Option](felix(), equinox(), junitBundles())
+    // to change the local repo used (for some operations, but not all -- which is why I didn't bother):
+    // systemProperty("org.ops4j.pax.url.mvn.localRepository").value(sys.props("maven.repo.local")))
   }
 
   def justReflectionOptions: Array[exam.Option]  = {
diff --git a/versions.properties b/versions.properties
index 865ce3e995..f4eed9d058 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,7 +1,9 @@
-starr.version=2.11.0-M5
+starr.version=2.11.0-M6
+starr.use.released=1
 
 # the below is used for depending on dependencies like partest
-scala.binary.version=2.11.0-M5
-partest.version.number=1.0-RC5
-scala-xml.version.number=1.0-RC4
-scala-parser-combinators.version.number=1.0-RC2
+scala.binary.version=2.11.0-M6
+partest.version.number=1.0.0-RC7
+scala-xml.version.number=1.0.0-RC6
+scala-parser-combinators.version.number=1.0.0-RC4
+scalacheck.version.number=1.10.1
\ No newline at end of file
-- 
cgit v1.2.3