From 2c7ad57066737366eba8e5afdaeff729b1a0bfa0 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 12 Apr 2019 15:09:19 +0100 Subject: [PATCH] Changed the old whitesource fs agent to unified --- .travis.yml | 8 +- ...-agent.config => .wss-unified-agent.config | 103 ++++++++++++------ 2 files changed, 71 insertions(+), 40 deletions(-) rename .whitesource-fs-agent.config => .wss-unified-agent.config (82%) diff --git a/.travis.yml b/.travis.yml index fb05ba5813..2c705fc7af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: # only on master and if it is not a PR if: fork = false AND branch = master AND type != pull_request script: - # Download the latest version of WhiteSource FS Agent - - curl -LJO https://github.com/whitesource/fs-agent-distribution/raw/master/standAlone/whitesource-fs-agent.jar - # Run WhiteSource FS Agent - - java -jar whitesource-fs-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .whitesource-fs-agent.config \ No newline at end of file + # Download the latest version of WhiteSource Unified Agent + - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar + # Run WhiteSource Unified Agent + - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config \ No newline at end of file diff --git a/.whitesource-fs-agent.config b/.wss-unified-agent.config similarity index 82% rename from .whitesource-fs-agent.config rename to .wss-unified-agent.config index c98fa49e12..e3e5f08dbb 100644 --- a/.whitesource-fs-agent.config +++ b/.wss-unified-agent.config @@ -1,31 +1,36 @@ #################################################################### -# WhiteSource FS-Agent configuration file +# WhiteSource Unified-Agent configuration file #################################################################### ########################################## # GENERAL SCAN MODE: Files and Package Managers ########################################## - + checkPolicies=true forceCheckAllDependencies=true forceUpdate=true forceUpdate.failBuildOnPolicyViolation=true offline=false #ignoreSourceFiles=true -#ignoreCertificateCheck=  #scanComment= #updateInventory=false - +#resolveAllDependencies=false +#failErrorLevel=ALL +#requireKnownSha1=false +#generateScanReport=true +#scanReportTimeoutMinutes=10 +#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model + #projectPerFolder=true #projectPerFolderIncludes= #projectPerFolderExcludes= - + #wss.connectionTimeoutMinutes=60 # Change the below URL to your WhiteSource server. # Use the 'WhiteSource Server URL' which can be retrieved # from your 'Profile' page on the 'Server URLs' panel. # Then, add the '/agent' path to it. wss.url=https://saas.whitesourcesoftware.com/agent - + #npm.resolveDependencies=false #npm.ignoreSourceFiles=false #npm.includeDevDependencies=true @@ -34,18 +39,20 @@ wss.url=https://saas.whitesourcesoftware.com/agent #npm.ignoreScripts=true #npm.yarnProject=true #npm.accessToken= - +#npm.identifyByNameAndVersion=true + #bower.resolveDependencies=false #bower.ignoreSourceFiles=true #bower.runPreStep=true - + #nuget.resolvePackagesConfigFiles=false #nuget.resolveCsProjFiles=false #nuget.resolveDependencies=false #nuget.restoreDependencies=true #nuget.ignoreSourceFiles=true #nuget.runPreStep=true - +#nuget.resolveNuspecFiles=false + #python.resolveDependencies=false #python.ignoreSourceFiles=false #python.ignorePipInstallErrors=true @@ -56,7 +63,7 @@ wss.url=https://saas.whitesourcesoftware.com/agent #python.runPipenvPreStep=true #python.pipenvDevDependencies=true #python.IgnorePipenvInstallErrors=true - + #maven.ignoredScopes=test provided maven.resolveDependencies=true #maven.ignoreSourceFiles=true @@ -64,7 +71,9 @@ maven.resolveDependencies=true maven.ignorePomModules=false #maven.runPreStep=true #maven.ignoreMvnTreeErrors=true - +#maven.environmentPath= +#maven.m2RepositoryPath= + #gradle.ignoredScopes= #gradle.resolveDependencies=false #gradle.runAssembleCommand=false @@ -72,86 +81,91 @@ maven.ignorePomModules=false #gradle.ignoreSourceFiles=true #gradle.aggregateModules=true #gradle.preferredEnvironment=wrapper -#gradle.runPreStep=true - +#gradle.localRepositoryPath= + #paket.resolveDependencies=false #paket.ignoredGroups= #paket.ignoreSourceFiles=false #paket.runPreStep=true #paket.exePath= - + #go.resolveDependencies=false #go.collectDependenciesAtRuntime=true #go.dependencyManager= #go.ignoreSourceFiles=true #go.glide.ignoreTestPackages=false #go.gogradle.enableTaskAlias=true - + #ruby.resolveDependencies = false #ruby.ignoreSourceFiles = false #ruby.installMissingGems = true #ruby.runBundleInstall = true #ruby.overwriteGemFile = true - + #sbt.resolveDependencies=false #sbt.ignoreSourceFiles=true #sbt.aggregateModules=true #sbt.runPreStep=true #sbt.targetFolder= - + #php.resolveDependencies=false #php.runPreStep=true #php.includeDevDependencies=true - + #html.resolveDependencies=false - + #cocoapods.resolveDependencies=false #cocoapods.runPreStep=true #cocoapods.ignoreSourceFiles=false - + +#hex.resolveDependencies=false +#hex.runPreStep=true +#hex.ignoreSourceFiles=false +#hex.aggregateModules=true + ################################## # Organization tokens: ################################## apiKey= - + #userKey is required if WhiteSource administrator has enabled "Enforce user level access" option #userKey= - + projectName=alfresco-data-model projectVersion= projectToken= - + productName=ACS Community productVersion= productToken= #updateType=APPEND #requesterEmail=user@provider.com - + ######################################################################################### # Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE ######################################################################################### #includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx - + #includes=**/*.m **/*.mm **/*.js **/*.php includes=**/*.jar #includes=**/*.gem **/*.rb #includes=**/*.dll **/*.cs **/*.nupkg #includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 #includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - + ## Exclude file extensions or specific directories by adding **/*. or **/** excludes=**/*sources.jar **/*javadoc.jar - + case.sensitive.glob=false followSymbolicLinks=true - + ################################## -# Archive Properties +# Archive properties ################################## #archiveExtractionDepth=2 #archiveIncludes=**/*.war **/*.ear #archiveExcludes=**/*sources.jar - + ################################## # Proxy settings ################################## @@ -159,7 +173,7 @@ followSymbolicLinks=true #proxy.port= #proxy.user= #proxy.pass= - + ################################## # SCM settings ################################## @@ -173,18 +187,18 @@ followSymbolicLinks=true #scm.npmInstall= #scm.npmInstallTimeoutMinutes= #scm.repositoriesFile= - + ############################################## # SCAN MODE: Linux package manager settings ############################################## #scanPackageManager=true - + ################################## # SCAN MODE: Docker images ################################## -#docker.includes=.*.* -#docker.excludes=.*.* #docker.scanImages=true +#docker.includes=.*.* +#docker.excludes= #docker.pull.enable=true #docker.pull.images=.*.* #docker.pull.maxImages=10 @@ -192,6 +206,23 @@ followSymbolicLinks=true #docker.pull.digest= #docker.delete.force=true #docker.login.sudo=false - + #docker.aws.enable=true #docker.aws.registryIds= + +################################## +# SCAN MODE: Docker containers +################################## +#docker.scanContainers=true +#docker.containerIncludes=.*.* +#docker.containerExcludes= + +################################ +# Serverless settings +################################ +#serverless.provider= +#serverless.scanFunctions=true +#serverless.includes= +#serverless.excludes= +#serverless.region= +#serverless.maxFunctions=10