From 96ae126866c7517fc94d60624295eedb22aed6ab Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 1 Oct 2018 16:55:27 +0200
Subject: [PATCH 1/2] Use handmade metadata from separate repo

---
 .gitmodules                      |  3 +++
 appveyor.yml                     |  3 ++-
 metadata                         |  1 +
 scripts/start-it-auth-server.ps1 |  3 ---
 scripts/travis.sh                |  2 +-
 scripts/with-test-repo.sh        | 45 --------------------------------
 6 files changed, 7 insertions(+), 50 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 metadata
 delete mode 100644 scripts/start-it-auth-server.ps1
 delete mode 100755 scripts/with-test-repo.sh

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..36a262e31
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "metadata"]
+	path = metadata
+	url = https://github.com/coursier/handmade-metadata.git
diff --git a/appveyor.yml b/appveyor.yml
index 0f846e506..98ff9d182 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,6 +14,7 @@ install:
   - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
   - cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET SBT_OPTS=-Xmx4g -Xss2m
+  - git submodule update --init --recursive
 environment:
   TEST_REPOSITORY_HOST: localhost
   TEST_REPOSITORY_PORT: 8080
@@ -21,7 +22,7 @@ environment:
   TEST_REPOSITORY_PASSWORD: pass
   TEST_REPOSITORY: http://localhost:8080
 build_script:
-  - ps: Start-Job -filepath .\scripts\start-it-auth-server.ps1 -ArgumentList $pwd, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD
+  - ps: Start-Job -filepath .\metadata\scripts\start-it-auth-server.ps1 -ArgumentList $pwd\metadata, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD
 test_script:
   - sbt scala212 sbt-coursier/scripted sbt-shading/scripted
 branches:
diff --git a/metadata b/metadata
new file mode 160000
index 000000000..a0752761c
--- /dev/null
+++ b/metadata
@@ -0,0 +1 @@
+Subproject commit a0752761c58fddd917f8b0c4bc8e69c8111ea606
diff --git a/scripts/start-it-auth-server.ps1 b/scripts/start-it-auth-server.ps1
deleted file mode 100644
index 8b24fc465..000000000
--- a/scripts/start-it-auth-server.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-# see https://stackoverflow.com/questions/2224350/powershell-start-job-working-directory/2246542#2246542
-Set-Location $args[0]
-& java -jar -noverify coursier launch io.get-coursier:http-server_2.12:1.0.0 -- -d tests/jvm/src/test/resources/test-repo/http/abc.com -u $args[3] -P $args[4] -r realm --host $args[1] --port $args[2] -v
diff --git a/scripts/travis.sh b/scripts/travis.sh
index ec40389b9..e29a63a7d 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -16,7 +16,7 @@ sbtShading() {
 }
 
 runSbtCoursierTests() {
-  ./scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test sbt-coursier/scripted
+  ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test sbt-coursier/scripted
 }
 
 runSbtShadingTests() {
diff --git a/scripts/with-test-repo.sh b/scripts/with-test-repo.sh
deleted file mode 100755
index 47ccc5136..000000000
--- a/scripts/with-test-repo.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-cd "$(dirname "$0")/.."
-
-SERVER_PID=""
-
-cleanup() {
-  if [ ! -z "$SERVER_PID" ]; then
-    echo "Terminating background HTTP server"
-    kill -15 "$SERVER_PID"
-    while kill -0 "$SERVER_PID" >/dev/null 2>&1; do
-      echo "Server still running"
-      sleep 1
-      kill -15 "$SERVER_PID" >/dev/null 2>&1 || true
-    done
-    echo "Server terminated"
-  fi
-}
-
-trap cleanup EXIT INT TERM
-
-export TEST_REPOSITORY_HOST="localhost"
-export TEST_REPOSITORY_PORT="8080"
-export TEST_REPOSITORY_USER="user"
-export TEST_REPOSITORY_PASSWORD="pass"
-
-export TEST_REPOSITORY="http://$TEST_REPOSITORY_HOST:$TEST_REPOSITORY_PORT"
-
-# see https://unix.stackexchange.com/questions/90244/bash-run-command-in-background-and-capture-pid
-runServerBg() {
-  java -jar ./coursier launch \
-    "io.get-coursier:http-server_2.12:1.0.0" \
-    -- \
-      -d tests/jvm/src/test/resources/test-repo/http/abc.com \
-      -u "$TEST_REPOSITORY_USER" -P "$TEST_REPOSITORY_PASSWORD" -r realm \
-      -v \
-      --host "$TEST_REPOSITORY_HOST" \
-      --port "$TEST_REPOSITORY_PORT" &
-  SERVER_PID="$!"
-}
-
-runServerBg
-
-"$@"

From c034332e1d83d1a7919f1485ea4271dbb680b63a Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 1 Oct 2018 17:03:18 +0200
Subject: [PATCH 2/2] Fix Appveyor build

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 98ff9d182..04d77a095 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ environment:
 build_script:
   - ps: Start-Job -filepath .\metadata\scripts\start-it-auth-server.ps1 -ArgumentList $pwd\metadata, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD
 test_script:
-  - sbt scala212 sbt-coursier/scripted sbt-shading/scripted
+  - sbt ++2.12.7 sbt-coursier/scripted sbt-shading/scripted
 branches:
   only:
     - master