Merge remote-tracking branch 'origin/2.0.x'

HOpenSource · Sep 28, 2018 · 71bc4a6 · 71bc4a6
2 parents f4c7bd2 + b494d2c
commit 71bc4a6
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,40 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-security-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-security-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts
diff --git a/circle.yml b/circle.yml
diff --git a/...pringframework/cloud/security/oauth2/client/tokenrelay/ResourceServerTokenRelayTests.java b/...pringframework/cloud/security/oauth2/client/tokenrelay/ResourceServerTokenRelayTests.java
@@ -61,7 +61,7 @@
 public class ResourceServerTokenRelayTests {
 
 	protected static final String TOKEN_VALID_UNTIL_2085 = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjM2NDA2ODU4ODIsInVzZXJfbmFtZSI6InJlYWRlciIsImF1dGhvcml0aWVzIjpbIlJPTEVfUkVBREVSIl0sImp0aSI6ImRkOTAzZGM2LTI0NDctNDViMi04MDZjLTIzZjU3ODVhNGQ4MCIsImNsaWVudF9pZCI6IndlYi1hcHAiLCJzY29wZSI6WyJyZWFkIl19.6hoNtxmN1_o5Ki0D0ae4amSOTRmit3pmaqv-z1-Qk4Y";
-	protected static final String AUTH_HEADER_TO_BE_RELAYED = "bearer " + TOKEN_VALID_UNTIL_2085;
+	protected static final String AUTH_HEADER_TO_BE_RELAYED = "Bearer " + TOKEN_VALID_UNTIL_2085;
 	protected static final String TEST_RESPONSE = "[\"test response\"]";
 
 	@Autowired