Run entire Cassandra Jenkins in an independent GKE account

.build/README.md

@@ -29,66 +29,6 @@ The following applies to all build scripts.
 
     build_dir=/tmp/cass_Mtu462n .build/docker/check-code.sh
 
-Running Sonar analysis (experimental)
--------------------------------------
-
-Run:
-
-    ant sonar
-
-Sonar analysis requires the SonarQube server to be available. If there
-is already some SonarQube server, it can be used by setting the
-following env variables:
-
-    SONAR_HOST_URL=http://sonar.example.com
-    SONAR_CASSANDRA_TOKEN=cassandra-project-analysis-token
-    SONAR_PROJECT_KEY=<key of the Cassandra project in SonarQube>
-
-If SonarQube server is not available, one can be started locally in
-a Docker container. The following command will create a SonarQube
-container and start the server:
-
-    ant sonar-create-server
-
-The server will be available at http://localhost:9000 with admin
-credentials admin/password. The Docker container named `sonarqube`
-is created and left running. When using this local SonarQube server,
-no env variables to configure url, token, or project key are needed,
-and the analysis can be run right away with `ant sonar`.
-
-After the analysis, the server remains running so that one can 
-inspect the results.
-
-To stop the local SonarQube server:
-
-    ant sonar-stop-server
-
-However, this command just stops the Docker container without removing
-it. It allows to start the container later with:
-
-    docker container start sonarqube
-
-and access previous analysis results. To drop the container, run:
-
-    docker container rm sonarqube
-
-When `SONAR_HOST_URL` is not provided, the script assumes a dedicated
-local instance of the SonarQube server and sets it up automatically,
-which includes creating a project, setting up the quality profile, and
-quality gate from the configuration stored in
-[sonar-quality-profile.xml](sonar%2Fsonar-quality-profile.xml) and
-[sonar-quality-gate.json](sonar%2Fsonar-quality-gate.json)
-respectively. To run the analysis with a custom quality profile, start
-the server using `ant sonar-create-server`, create a project manually,
-and set up a desired quality profile for it. Then, create the analysis
-token for the project and export the following env variables:
-
-    SONAR_HOST_URL="http://127.0.0.1:9000"
-    SONAR_CASSANDRA_TOKEN="<token>"
-    SONAR_PROJECT_KEY="<key of the Cassandra project in SonarQube>"
-
-The analysis can be run with `ant sonar`.
-
 
 Building Artifacts (tarball and maven)
 -------------------------------------
@@ -125,7 +65,7 @@ Build with a specific jdk:
     .build/docker/build-redhat.sh rpm 11
 
 
-Build with centos7 and a specific jdk:
+Build with legacy noboolean and a specific jdk:
 
     .build/docker/build-redhat.sh noboolean 11
 
@@ -177,7 +117,7 @@ Running other types of tests with docker:
     .build/docker/run-tests.sh jvm-dtest-upgrade
     .build/docker/run-tests.sh dtest
     .build/docker/run-tests.sh dtest-novnode
-    .build/docker/run-tests.sh dtest-offheap
+    .build/docker/run-tests.sh dtest-latest
     .build/docker/run-tests.sh dtest-large
     .build/docker/run-tests.sh dtest-large-novnode
     .build/docker/run-tests.sh dtest-upgrade
@@ -198,3 +138,63 @@ Other python dtest types without docker:
 
     .build/run-python-dtests.sh dtest-upgrade-large
 
+
+Running Sonar analysis (experimental)
+-------------------------------------
+
+Run:
+
+    ant sonar
+
+Sonar analysis requires the SonarQube server to be available. If there
+is already some SonarQube server, it can be used by setting the
+following env variables:
+
+    SONAR_HOST_URL=http://sonar.example.com
+    SONAR_CASSANDRA_TOKEN=cassandra-project-analysis-token
+    SONAR_PROJECT_KEY=<key of the Cassandra project in SonarQube>
+
+If SonarQube server is not available, one can be started locally in
+a Docker container. The following command will create a SonarQube
+container and start the server:
+
+    ant sonar-create-server
+
+The server will be available at http://localhost:9000 with admin
+credentials admin/password. The Docker container named `sonarqube`
+is created and left running. When using this local SonarQube server,
+no env variables to configure url, token, or project key are needed,
+and the analysis can be run right away with `ant sonar`.
+
+After the analysis, the server remains running so that one can
+inspect the results.
+
+To stop the local SonarQube server:
+
+    ant sonar-stop-server
+
+However, this command just stops the Docker container without removing
+it. It allows to start the container later with:
+
+    docker container start sonarqube
+
+and access previous analysis results. To drop the container, run:
+
+    docker container rm sonarqube
+
+When `SONAR_HOST_URL` is not provided, the script assumes a dedicated
+local instance of the SonarQube server and sets it up automatically,
+which includes creating a project, setting up the quality profile, and
+quality gate from the configuration stored in
+[sonar-quality-profile.xml](sonar%2Fsonar-quality-profile.xml) and
+[sonar-quality-gate.json](sonar%2Fsonar-quality-gate.json)
+respectively. To run the analysis with a custom quality profile, start
+the server using `ant sonar-create-server`, create a project manually,
+and set up a desired quality profile for it. Then, create the analysis
+token for the project and export the following env variables:
+
+    SONAR_HOST_URL="http://127.0.0.1:9000"
+    SONAR_CASSANDRA_TOKEN="<token>"
+    SONAR_PROJECT_KEY="<key of the Cassandra project in SonarQube>"
+
+The analysis can be run with `ant sonar`.

.build/build-jars.sh

@@ -19,7 +19,7 @@
 
 # variables, with defaults
 [ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
-
+echo "$CASSANDRA_DIR from build_jar"
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1; }
 [ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; }

.build/build-owasp.xml

@@ -19,7 +19,7 @@
 <project basedir="." name="apache-cassandra-owasp-tasks"
          xmlns:unless="ant:unless"
          xmlns:if="ant:if">
-    <property name="dependency-check.version" value="9.0.5"/>
+    <property name="dependency-check.version" value="10.0.4"/>
     <property name="dependency-check.home" value="${tmp.dir}/dependency-check-ant-${dependency-check.version}"/>
     <property name="dependency-check.archive.dir" value="${local.repository}/org/owasp/dependency-check-ant/${dependency-check.version}"/>
     <property name="dependency-check.archive.name" value="dependency-check-ant-${dependency-check.version}-release.zip"/>

.build/build-resolver.xml

@@ -58,8 +58,19 @@
         <resolver:remoterepos id="all">
             <remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
             <remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
-            <!-- Snapshots are not allowed, but for feature branches they may be needed, so uncomment the below to allow snapshots to work -->
-            <!-- <remoterepo id="resolver-apache-snapshot" url="https://repository.apache.org/content/repositories/snapshots" releases="false" snapshots="true" updates="always" checksums="fail" /> -->
+            <!-- Snapshot artifacts must not exist in nor be downloaded by any Cassandra release artifact.
+                 Please validate that all artifacts included in parent-pom-template.xml are release
+                 artifacts before committing.
+
+                 To build with a snapshot dependency, ensure build.properties or build.properties.default
+                 contain the correct resolution for "artifact.remoteRepository.apacheSnapshot" and uncomment
+                 the following line.
+
+                 You may also need to add an exclusion for "resolver-apache-snapshot" to your mirrors in ~/.m2/settings.xml
+                 or ~/.ant/settings.xml (maven ant resolver supersedes) as mirrors will, by default, catch and override
+                 all dependency resolution regardless of it being a -SNAPSHOT lib or not.
+             -->
+            <!-- <remoterepo id="resolver-apache-snapshot" url="${artifact.remoteRepository.apacheSnapshot}" releases="false" snapshots="true" updates="always" checksums="fail" /> -->
         </resolver:remoterepos>
 
         <macrodef name="resolve">

.build/cassandra-build-deps-template.xml

@@ -143,5 +143,17 @@
       <groupId>com.carrotsearch.randomizedtesting</groupId>
       <artifactId>randomizedtesting-runner</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk18on</artifactId>
+    </dependency>
   </dependencies>
 </project>

.build/cassandra-deps-template.xml

@@ -157,10 +157,6 @@
       <groupId>com.github.jbellis</groupId>
       <artifactId>jamm</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>

.build/check-code.sh

@@ -24,5 +24,5 @@ command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1
 [ -f "${CASSANDRA_DIR}/build.xml" ] || { echo >&2 "${CASSANDRA_DIR}/build.xml must exist"; exit 1; }
 
 # execute
-ant -f "${CASSANDRA_DIR}/build.xml" check dependency-check
+ant -f "${CASSANDRA_DIR}/build.xml" check # dependency-check # FIXME dependency-check now requires NVD key downloaded first
 exit $?

.build/checkstyle.xml

@@ -169,6 +169,10 @@
       <property name="message" value="Use the CassandraRelevantProperties or CassandraRelevantEnv instead." />
     </module>
 
+    <module name="IllegalType"> <!-- usage of var check -->
+      <property name="illegalClassNames" value="var"/>
+    </module>
+
     <module name="RedundantImport"/>
     <module name="UnusedImports"/>