Merge remote-tracking branch 'elastic/master' into geosql

Author: imotov

TESTING.asciidoc

@@ -498,8 +498,8 @@ sudo bash $PACKAGING_TESTS/run-tests.sh
 
 # run specific test cases
 sudo bash $PACKAGING_TESTS/run-tests.sh \
-  org.elasticsearch.packaging.test.DefaultZipTests \
-  org.elasticsearch.packaging.test.OssZipTests
+  org.elasticsearch.packaging.test.DefaultWindowsZipTests \
+  org.elasticsearch.packaging.test.OssWindowsZipTests
 --------------------------------------------
 
 or on Windows, from a terminal running as Administrator
@@ -510,8 +510,8 @@ powershell -File $Env:PACKAGING_TESTS/run-tests.ps1
 
 # run specific test cases
 powershell -File $Env:PACKAGING_TESTS/run-tests.ps1 `
-  org.elasticsearch.packaging.test.DefaultZipTests `
-  org.elasticsearch.packaging.test.OssZipTests
+  org.elasticsearch.packaging.test.DefaultWindowsZipTests `
+  org.elasticsearch.packaging.test.OssWindowsZipTests
 --------------------------------------------
 
 Note that on Windows boxes when running from inside the GUI, you may have to log out and

benchmarks/src/main/java/org/elasticsearch/benchmark/time/RoundingBenchmark.java

@@ -18,6 +18,8 @@
  */
 import org.gradle.util.GradleVersion
 
+import java.util.regex.Matcher
+
 plugins {
   id 'java-gradle-plugin'
   id 'groovy'
@@ -226,7 +228,10 @@ if (project != rootProject) {
     systemProperty 'test.local-test-repo-path', "${rootProject.buildDir}/local-test-repo"
     systemProperty 'test.local-test-downloads-path', localDownloads
     systemProperty 'test.version_under_test', version
-    systemProperty 'test.lucene-snapshot-revision', (versions.lucene =~ /\w+-snapshot-([a-z0-9]+)/)[0][1]
+    Matcher isLuceneSnapshot = (/\w+-snapshot-([a-z0-9]+)/ =~ versions.lucene)
+    if (isLuceneSnapshot) {
+      systemProperty 'test.lucene-snapshot-revision', isLuceneSnapshot[0][1]
+    }
   }
   check.dependsOn(integTest)
 

buildSrc/build.gradle

@@ -115,7 +115,8 @@ class ClusterFormationTasks {
             String elasticsearchVersion
             if (i < config.numBwcNodes) {
                 elasticsearchVersion = config.bwcVersion.toString()
-                if (project.bwcVersions.unreleased.contains(config.bwcVersion)) {
+                if (project.bwcVersions.unreleased.contains(config.bwcVersion) && 
+                    (project.version != elasticsearchVersion)) {
                     elasticsearchVersion += "-SNAPSHOT"
                 }
                 distro = bwcDistro
@@ -690,6 +691,13 @@ class ClusterFormationTasks {
                     env(key: 'JAVA_HOME', value: project.runtimeJavaHome)
                 }
                 node.args.each { arg(value: it) }
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    // Having no TMP on Windows defaults to C:\Windows and permission errors
+                    // Since we configure ant to run with a new  environment above, we need to set this to a dir we have access to
+                    File tmpDir = new File(node.baseDir, "tmp")
+                    tmpDir.mkdirs()
+                    env(key: "TMP", value: tmpDir.absolutePath)
+                }
             }
         }
 

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

@@ -60,7 +60,15 @@ class VagrantTestPlugin implements Plugin<Project> {
             'packages:rpm',
             'packages:oss-rpm',
             'packages:deb',
-            'packages:oss-deb'
+            'packages:oss-deb',
+            'archives:no-jdk-linux-tar',
+            'archives:oss-no-jdk-linux-tar',
+            'archives:no-jdk-windows-zip',
+            'archives:oss-no-jdk-windows-zip',
+            'packages:no-jdk-rpm',
+            'packages:oss-no-jdk-rpm',
+            'packages:no-jdk-deb',
+            'packages:oss-no-jdk-deb'
     ])
 
     /** Packages onboarded for upgrade tests **/

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -66,8 +66,8 @@ public void testConcatenationWithUnique() throws IOException {
         file2.getParentFile().mkdirs();
         file1.createNewFile();
         file2.createNewFile();
-        Files.write(file1.toPath(), "Hello\nHello".getBytes());
-        Files.write(file2.toPath(), "Hello\nनमस्ते".getBytes());
+        Files.write(file1.toPath(), ("Hello" + System.lineSeparator() +  "Hello").getBytes(StandardCharsets.UTF_8));
+        Files.write(file2.toPath(), ("Hello" + System.lineSeparator() + "नमस्ते").getBytes(StandardCharsets.UTF_8));
 
         concatFilesTask.setFiles(project.fileTree(file1.getParentFile().getParentFile()));
 

buildSrc/src/test/java/org/elasticsearch/gradle/ConcatFilesTaskTests.java

@@ -1,7 +1,7 @@
 elasticsearch     = 8.0.0
-lucene            = 8.0.0-snapshot-ff9509a8df
+lucene            = 8.0.0
 
-bundled_jdk       = 11.0.2+9
+bundled_jdk       = 12+33
 
 # optional dependencies
 spatial4j         = 0.7
@@ -23,6 +23,12 @@ jna               = 4.5.1
 netty             = 4.1.32.Final
 joda              = 2.10.1
 
+# when updating this version, you need to ensure compatibility with:
+#  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
+#  - distribution/tools/plugin-cli
+#  - x-pack/plugin/security
+bouncycastle      = 1.61
+
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.12