Update CircleCI image (#175)

* Update CircleCI image

* PROD-4909: Change docker image

Move away from deprecated image

* Fix CircleCI

Co-authored-by: Stephen Colebourne <stephen@opengamma.com>

Author: martynassateika

.circleci/config.yml

@@ -6,13 +6,15 @@ executors:
 
 #----------------------------------------------------------------------------
 # vital to set the MaxRAM parameter as cgroups settings are not passed to the JVM
-  jdk11:
+  jdk11-small:
     docker:
-      - image: circleci/openjdk:11.0.2-jdk
+      - image: cimg/openjdk:11.0
+    resource_class: small
     working_directory: ~/repo
     environment:
       JAVA_TOOL_OPTIONS: -XX:MaxRAM=1536m
-      MAVEN_OPTS: -Xmx512m
+      MAVEN_OPTS: -Xmx736m
+      REPO_NAME: ClientData
 
 
 #############################################################################
@@ -27,9 +29,9 @@ commands:
       - run:
           name: Initializing Maven
           command: |
-            mvn --version
             mkdir -p ./.mvn
-            echo '-e -B -DtrimStackTrace=false --settings .circleci/maven-settings.xml' > ./.mvn/maven.config
+            echo "-e -B -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS -DtrimStackTrace=false -Dsurefire.useSystemClassLoader=false -Dog.deploy.branch=$CIRCLE_BRANCH -Dog.deploy.tag=$CIRCLE_TAG -Dog.deploy.sha=$CIRCLE_SHA1 --settings .circleci/maven-settings.xml" > ./.mvn/maven.config
+            mvn --version
 
 #----------------------------------------------------------------------------
   maven_install_test:
@@ -57,9 +59,9 @@ commands:
           command: |
             RELEASE_SHA=$(git rev-parse HEAD)
             git checkout main
-            MASTER_SHA=$(git rev-parse HEAD)
-            if [[ "$RELEASE_SHA" != "$MASTER_SHA" ]]; then
-              echo "release tag SHA != main HEAD SHA, $RELEASE_SHA $MASTER_SHA"
+            MAIN_SHA=$(git rev-parse HEAD)
+            if [[ "$RELEASE_SHA" != "$MAIN_SHA" ]]; then
+              echo "release tag SHA != main HEAD SHA, $RELEASE_SHA $MAIN_SHA"
               exit 1
             fi
             git config --local user.email "cibot@opengamma.com"
@@ -127,15 +129,15 @@ commands:
 # jobs to run
 jobs:
   build:
-    executor: jdk11
+    executor: jdk11-small
     steps:
       - perform_build:
           actions:
             - maven_install_test
 
 #----------------------------------------------------------------------------
   release:
-    executor: jdk11
+    executor: jdk11-small
     steps:
       - perform_build:
           actions:
@@ -145,7 +147,7 @@ jobs:
 
 #----------------------------------------------------------------------------
   trigger_release:
-    executor: jdk11
+    executor: jdk11-small
     steps:
       - perform_build:
           actions:

README.md

@@ -1,6 +1,6 @@
 # OpenGamma Java SDK
 
-[![Build Status](https://travis-ci.org/OpenGamma/JavaSDK.svg?branch=master)](https://travis-ci.org/OpenGamma/JavaSDK) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Build Status](https://travis-ci.org/OpenGamma/JavaSDK.svg?branch=main)](https://travis-ci.org/OpenGamma/JavaSDK) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 The OpenGamma service is a platform for the independent calculation of metrics such as margin, fees and balance sheet,
 to enable firms to optimize execution and clearing of derivatives.

RELEASE.md

@@ -5,7 +5,7 @@ The release process is as follows:
 
 1. Ensure all required changes have been merged
 
-1. Check out the master branch and ensure there are no local changes
+1. Check out the main branch and ensure there are no local changes
 
 1. Update CHANGELOG.md and version in README.md, committing the changes
 

modules/margin/src/test/java/com/opengamma/sdk/margin/it/MarginClientRemoteIT.java

@@ -19,6 +19,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -56,6 +57,7 @@
  * Run as a formal integration test via maven failsafe.
  * Requires two environment variables, hence is run via a maven profile.
  */
+@Disabled("API key not public")
 @SuppressWarnings("deprecation")
 @TestInstance(Lifecycle.PER_CLASS)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)