diff --git a/.azure-pipelines/fluentJavaMgmt.yml b/.azure-pipelines/fluentJavaMgmt.yml index 7fdf29fa28b..261594107a2 100644 --- a/.azure-pipelines/fluentJavaMgmt.yml +++ b/.azure-pipelines/fluentJavaMgmt.yml @@ -111,7 +111,7 @@ jobs: ProfileFlag: '' Linux - Java 8: OSName: 'Linux' - OSVmImage: 'ubuntu-18.04' + OSVmImage: 'ubuntu-20.04' JavaVersion: '1.8' ProfileFlag: '' Linux - Java 7: @@ -152,7 +152,7 @@ jobs: displayName: 'Run Tests on Java $(JavaVersion)' inputs: mavenPomFile: pom.xml - options: '--batch-mode $(DefaultOptions) $(ProfileFlag) -Dsurefire.rerunFailingTestsCount=3 -Dparallel=classes -DthreadCount=2 -DforkCount=1C' + options: '--batch-mode $(DefaultOptions) $(ProfileFlag) -Dsurefire.rerunFailingTestsCount=3' mavenOptions: '$(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index beafe7170cf..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -if: branch = master - -dist: trusty -language: java -sudo: required -jdk: -- oraclejdk8 -- openjdk7 -services: -- docker -before_script: -- mvn jetty:run & -- sleep 5 -script: -- |- - ./ci/run_tests.sh || travis_terminate 1 ; - if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_BRANCH == "master" ]] && [[ ${TRAVIS_JDK_VERSION} = "oraclejdk8" ]]; then - ./ci/create_image.sh ; - fi diff --git a/README.md b/README.md index 94f83e8e5f0..746a67b992a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/fluentJava/Azure.azure-libraries-for-java?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=608&branchName=master) -[![Build Status](https://travis-ci.org/Azure/azure-libraries-for-java.svg?style=flat-square&label=build&branch=master)](https://travis-ci.org/Azure/azure-libraries-for-java) # Try the Next-Generation Azure Management SDK for Java now diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 635d2c7905f..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,22 +0,0 @@ -environment: - access_token: - secure: JWSy9tPo2eoTYpPQplvokf4IiVk6onNBbWwAs6nNWWyQ2JaO+MRAg/QzbJnTjpUm - -before_build: - - cd .. - - git config --global credential.helper store - - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n" - - git config --global user.email "vscopbld@microsoft.com" - - git config --global user.name "OpenPublishBuild" - - git clone "https://github.com/Azure/azure-docs-sdk-java.git" "docs" - -build_script: - - ps: docs\Scripts\build.ps1 - -on_success: - - cd docs - - git add . - - git diff --quiet --exit-code --cached || git commit -m "CI Updates" && git push -u origin master -#on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - diff --git a/jetty.xml b/jetty.xml index dad29dc54fd..a63436ef2c0 100644 --- a/jetty.xml +++ b/jetty.xml @@ -18,21 +18,4 @@ - - - - - - - - - - - - - - 11081 - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8688ac1f505..338f5d92642 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ com.microsoft.azure azure-client-runtime - 1.7.10 + 1.7.12 com.microsoft.azure azure-client-authentication - 1.7.10 + 1.7.12 com.google.guava @@ -156,7 +156,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.2.22.v20170606 + 9.2.30.v20200428 0 11079