Changed http to https for all links to downloads.codekvast.io and www…

….codekvast.io.

Formatted sources.

DEVELOPMENT-GUIDE.md

@@ -40,7 +40,7 @@ See `man git-crypt`, `git-crypt help add-gpg-user` and `git-crypt help unlock`.
 
 ## Web site
 
-Web pages (i.e., http://www.codekvast.io) lives in the Git repo `https://github.com/crispab/codekvast-site`.
+Web pages (i.e., https://www.codekvast.io) lives in the Git repo `https://github.com/crispab/codekvast-site`.
 
 ## Development environment
 
@@ -110,7 +110,7 @@ The pipeline is defined by `Jenkinsfile`.
 To access http://jenkins.crisp.se you need to be either a Member or an Outside collaborator of https://github.com/orgs/crispab/people.
 
 ## Software publishing
-Codekvast Agent is published to http://downloads.codekvast.io as well as to jcenter.
+Codekvast Agent is published to https://downloads.codekvast.io as well as to jcenter.
 
 You execute the publishing by executing `tools/ship-agent.sh` in the root of the project.
 

README.md

@@ -32,7 +32,7 @@ Codekvast is released under the MIT license.
 
 ### Pre-built binaries
 
-Pre-built binaries, and the User Manual are available for download from [downloads.codekvast.io](http://downloads.codekvast.io).
+Pre-built binaries, and the User Manual are available for download from [downloads.codekvast.io](https://downloads.codekvast.io).
 
 * codekvast-agent-x.x.x.zip contains the *Codekvast Agent* as well as a sample `codekvast.conf`.
 
@@ -44,4 +44,4 @@ Pre-built binaries, and the User Manual are available for download from [downloa
 
 ## Development Guide
 
-See [DEVELOPMENT-GUIDE.md](DEVELOPMENT-GUIDE.md)
+See [DEVELOPMENT-GUIDE.md](DEVELOPMENT-GUIDE.md)

deploy/.check-requirements.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-if [ "$(which ansible)" == "" ]; then
+if [[ "$(which ansible)" == "" ]]; then
     echo "Ansible is not installed"
     exit 1
 fi
@@ -15,7 +15,7 @@ case "$ansibleVersion" in
 esac
 
 for f in ~/.boto ~/.ssh/codekvast-amazon.pem; do
-    if [ ! -f ${f} ]; then
+    if [[ ! -f ${f} ]]; then
         echo "Missing required file: $f" 1>&2
         exit 1
     fi

deploy/playbooks/copy-database-from-prod-to-staging.yml

@@ -2,29 +2,29 @@
 #-----------------------------------------------------------------------------------------------------------
 # Playbook that makes a backup of the production database to S3 and then restores it to the staging database
 #-----------------------------------------------------------------------------------------------------------
-- name: Make extra production database backup
-  hosts: tag_Name_Codekvast_default_prod_database
-  user: ubuntu
+- name:   Make extra production database backup
+  hosts:  tag_Name_Codekvast_default_prod_database
+  user:   ubuntu
   become: yes
 
   tasks:
-  - name: "Making an extra database backup of {{ ec2_tag_CNAME }}"
+  - name:  "Making an extra database backup of {{ ec2_tag_CNAME }}"
     shell: /root/mariadb-backup extra
 
-- name: Restore extra production database
-  hosts: tag_Name_Codekvast_default_staging_database
-  user: ubuntu
+- name:   Restore extra production database
+  hosts:  tag_Name_Codekvast_default_staging_database
+  user:   ubuntu
   become: yes
 
   vars:
-    mysql_backup_dir: '/var/backups/mariadb'
-    s3_bucket: "s3://io.codekvast.default.prod.backup"
-    tarball: "mariadb-backup-extra.tar.gz"
+      mysql_backup_dir: '/var/backups/mariadb'
+      s3_bucket:        "s3://io.codekvast.default.prod.backup"
+      tarball:          "mariadb-backup-extra.tar.gz"
 
   tasks:
 
-  - name: "Fetching {{ s3_bucket }}/{{ tarball }} to {{ ec2_tag_CNAME }}:{{ mysql_backup_dir }}"
+  - name:  "Fetching {{ s3_bucket }}/{{ tarball }} to {{ ec2_tag_CNAME }}:{{ mysql_backup_dir }}"
     shell: "s3cmd --config=/root/s3cfg --force get {{ s3_bucket }}/{{ tarball }} {{ mysql_backup_dir }}"
 
-  - name: "Restoring {{ mysql_backup_dir }}/{{ tarball }} in {{ ec2_tag_CNAME }}"
+  - name:  "Restoring {{ mysql_backup_dir }}/{{ tarball }} in {{ ec2_tag_CNAME }}"
     shell: "/root/mariadb-restore {{ mysql_backup_dir }}/{{ tarball }} --yes"

deploy/roles/codekvast.spring-boot-service/templates/codekvast-agent.properties

@@ -1,46 +1,14 @@
 #-----------------------------------------------------------------------------------------
-# Sample Codekvast configuration file.
-#
-# Below are the most common configuration properties described.
-#
-# See http://www.codekvast.io/pages/config.html for all details.
+# Codekvast configuration file.
 #-----------------------------------------------------------------------------------------
 
-# What is my application's name? Useful if more that one app delivers data to the same Codekvast server using the same licenseKey.
 appName = Codekvast {{ service_name | capitalize }}
-
-# What is my app's version?
-# The value of this parameter is a strategy for obtaining the actual version.
-# See http://www.codekvast.io/pages/config.html for full description of how to specify the appVersion.
 appVersion = manifest /opt/codekvast/{{ service_name }}/codekvast-{{ service_name }}-{{ codekvastVersion }}-all.jar
-
-# Where are my application binaries?
-# A comma-separated list of file system paths relative to the root directory.
 codeBase = /opt/codekvast/{{ service_name }}/codekvast-{{ service_name }}-{{ codekvastVersion }}-all.jar
-
-# What packages shall be tracked?
-# A comma-separated list of strings.
 packages = io.codekvast
-
-# What packages shall *not* be tracked?
-# A comma-separated list of strings.
 excludePackages = io.codekvast.javaagent
-
-# In which environment is the application deployed?
-# An arbitrary string, useful for separating data collected in different environments.
 environment = {{ env }}
-
-# Which hostname should be used in publications?
-# If not specified, the machine's native hostname is used.
 hostname = {{ ec2_tag_CNAME }}
-
-# Which methods should be tracked?
-# One of the keywords public, protected, package-private or private.
-# See http://www.codekvast.io/pages/config.html for full description.
 methodVisibility = all
-
-# Where is the Codekvast server?
 serverUrl = https://api.codekvast.io
-
-# What is my license key?
 licenseKey = {{ codekvast.licenseKey }}

gradle.properties

@@ -1,23 +1,23 @@
 # --- Codekvast version
-codekvastVersion = 1.0.0
+codekvastVersion             = 1.0.0
 
 # --- Gradle tuning
-org.gradle.daemon = true
+org.gradle.daemon            = true
 org.gradle.configureondemand = true
-org.gradle.parallel = true
-org.gradle.caching = true
+org.gradle.parallel          = true
+org.gradle.caching           = true
 
 # --- Bintray config
-codekvastDownloadPrefix = http\://downloads.codekvast.io
+codekvastDownloadPrefix      = http\://downloads.codekvast.io
 
 # --- Kotlin
-kotlin.incremental = true
+kotlin.incremental           = true
 
 # --- SDKMAN managed Java versions (used by <rootDir>/tools/prepare-workstation/run.sh and *.gradle)
-sdkmanJavaVersion_11 = 11.0.2-zulu
-sdkmanJavaVersion_10 = 10.0.2-zulu
-sdkmanJavaVersion_9 = 9.0.7-zulu
-sdkmanJavaVersion_8 = 8.0.201-zulu
-sdkmanJavaVersion_7 = 7.0.201-zulu
+sdkmanJavaVersion_11         = 11.0.2-zulu
+sdkmanJavaVersion_10         = 10.0.2-zulu
+sdkmanJavaVersion_9          = 9.0.7-zulu
+sdkmanJavaVersion_8          = 8.0.201-zulu
+sdkmanJavaVersion_7          = 7.0.201-zulu
 
-sdkmanJavaDefault = 11.0.2-zulu # Used by .gradlew (and thus Jenkinsfile)
+sdkmanJavaDefault            = 11.0.2-zulu # Used by .gradlew (and thus Jenkinsfile)

gradle/java.gradle

@@ -17,8 +17,8 @@ uptodate {
 jar {
     manifest {
         attributes(
-                "Implementation-Title": archivesBaseName,
-                "Implementation-Version": codekvastDisplayVersion
+            "Implementation-Title": archivesBaseName,
+            "Implementation-Version": codekvastDisplayVersion
         )
     }
 }
@@ -71,6 +71,6 @@ configurations.forEach { it ->
 
 // TODO: Run javadoc on delomboked code
 javadoc {
-    title  "Codekvast version $codekvastDisplayVersion"
+    title "Codekvast version $codekvastDisplayVersion"
     failOnError = false
 }

gradle/sample-jenkins.gradle

@@ -13,11 +13,11 @@ defaultTasks 'run'
 
 def javaVersion = sdkmanJavaVersion_8
 def tomcatVersion = "7.0.92"
-def tomcatDownloadUrl = "http://downloads.codekvast.io/apache-tomcat-${tomcatVersion}.zip"
+def tomcatDownloadUrl = "https://downloads.codekvast.io/apache-tomcat-${tomcatVersion}.zip"
 def tomcatDir = file("$buildDir/tomcat")
 def catalinaBase = new File(tomcatDir, "apache-tomcat-${tomcatVersion}")
 def catalinaWebapps = new File(catalinaBase, "webapps")
-def jenkinsDownloadUrl = "http://downloads.codekvast.io/jenkins-${jenkinsVersion}.war"
+def jenkinsDownloadUrl = "https://downloads.codekvast.io/jenkins-${jenkinsVersion}.war"
 
 task installJenkinsWarInTomcat {
     def downloadDir = file("$rootDir/.tmp/download")
@@ -39,10 +39,10 @@ task installJenkinsWarInTomcat {
 
         logger.lifecycle "Downloading $tomcatDownloadUrl ..."
         ant.get(
-                src: tomcatDownloadUrl,
-                dest: downloadDir,
-                usetimestamp: true,
-                verbose: true
+            src: tomcatDownloadUrl,
+            dest: downloadDir,
+            usetimestamp: true,
+            verbose: true
         )
 
         logger.lifecycle "Unpacking Tomcat into $tomcatDir ..."
@@ -58,10 +58,10 @@ task installJenkinsWarInTomcat {
 
         logger.lifecycle "Downloading $jenkinsDownloadUrl into $downloadDir ..."
         ant.get(
-                src: jenkinsDownloadUrl,
-                dest: downloadDir,
-                usetimestamp: true,
-                verbose: true
+            src: jenkinsDownloadUrl,
+            dest: downloadDir,
+            usetimestamp: true,
+            verbose: true
         )
 
         logger.lifecycle "Copying jenkins.war into $catalinaWebapps ..."
@@ -164,5 +164,5 @@ task run(type: Exec) {
     commandLine "$catalinaBase/bin/catalina.sh", "run"
 
     // Illustrate that config can be injected from environment variables
-    environment['CODEKVAST_APP_NAME']='Jenkins'
+    environment['CODEKVAST_APP_NAME'] = 'Jenkins'
 }

product/dashboard/src/integrationTest/resources/application-integrationTest.properties

@@ -1,6 +1,6 @@
 # Enable file logging
-logging.file=build/log/integrationTest.log
+logging.file                            = build/log/integrationTest.log
 # Disable @Scheduled
 codekvast.fileImportInitialDelaySeconds = 100000000
 # Use a random port for the management interface...
-management.server.port = 0
+management.server.port                  = 0

product/dashboard/src/main/java/io/codekvast/dashboard/bootstrap/SwaggerConfig.java

@@ -75,8 +75,8 @@ private ApiInfo getApiInfo(CodekvastDashboardSettings settings, String descripti
         return new ApiInfo(settings.getApplicationName(),
                            description,
                            settings.getDisplayVersion(),
-                           "http://www.codekvast.io/pages/terms-of-service.html",
-                           new Contact("Codekvast", "http://www.codekvast.io", "[email protected]"),
+                           "https://www.codekvast.io/pages/terms-of-service.html",
+                           new Contact("Codekvast", "https://www.codekvast.io", "[email protected]"),
                            "Licensed under the MIT license",
                            "https://opensource.org/licenses/MIT",
                            new ArrayList<>());

product/dashboard/src/main/resources/application.properties

@@ -7,20 +7,20 @@
 #-------------------------------------------------------------------------------------------------------
 
 # info.build.* is visible in the management interface
-info.build.gradle.name                         = <%= project.archivesBaseName %>
-info.build.gradle.description                  = <%= project.description %>
-info.build.gradle.version                      = <%= project.codekvastDisplayVersion %>
-info.build.git.id                              = <%= project.gitId %>
-info.build.git.committer                       = <%= project.gitCommitter %>
-info.build.git.message                         = <%= project.gitShortMessage %>
-info.build.git.time                            = <%= project.gitTime %>
+info.build.gradle.name        = <%= project.archivesBaseName %>
+info.build.gradle.description = <%= project.description %>
+info.build.gradle.version     = <%= project.codekvastDisplayVersion %>
+info.build.git.id             = <%= project.gitId %>
+info.build.git.committer      = <%= project.gitCommitter %>
+info.build.git.message        = <%= project.gitShortMessage %>
+info.build.git.time           = <%= project.gitTime %>
 
 # application.version is shown in the banner on the console
-application.version                            = <%= project.codekvastDisplayVersion %>
+application.version           = <%= project.codekvastDisplayVersion %>
 
 # codekvast.* are available in CodekvastSettings.java
-codekvast.applicationName                      = <%= project.archivesBaseName %>
-codekvast.displayVersion                       = <%= project.codekvastDisplayVersion %>
-codekvast.committer                            = <%= project.gitCommitter %>
-codekvast.commitDate                           = <%= project.gitTime %>
-codekvast.commitMessage                        = <%= project.gitShortMessage %>
+codekvast.applicationName     = <%= project.archivesBaseName %>
+codekvast.displayVersion      = <%= project.codekvastDisplayVersion %>
+codekvast.committer           = <%= project.gitCommitter %>
+codekvast.commitDate          = <%= project.gitTime %>
+codekvast.commitMessage       = <%= project.gitShortMessage %>