diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 7b172165abefb..3aadf5af1ee8a 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -13,8 +13,7 @@ jackson = 2.12.5 snakeyaml = 1.26 icu4j = 62.1 supercsv = 2.4.0 -# when updating log4j, please update also docs/java-api/index.asciidoc -log4j = 2.11.1 +log4j = 2.11.2 slf4j = 1.6.2 # when updating the JNA version, also update the version in buildSrc/build.gradle diff --git a/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$1.class b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$1.class new file mode 100644 index 0000000000000..096d5982f62a4 Binary files /dev/null and b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$1.class differ diff --git a/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$2.class b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$2.class new file mode 100644 index 0000000000000..c7f259e0bee39 Binary files /dev/null and b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$2.class differ diff --git a/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$3.class b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$3.class new file mode 100644 index 0000000000000..de1dee17b5fb5 Binary files /dev/null and b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$3.class differ diff --git a/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet.class b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet.class new file mode 100644 index 0000000000000..e4f797ad19a8e Binary files /dev/null and b/doc-tools/missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet.class differ diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1 deleted file mode 100644 index 575d75dbda8c5..0000000000000 --- a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3aba3398fe064a3eab4331f88161c7480e848418 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..3a6c48f8c9880 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1 deleted file mode 100644 index 575d75dbda8c5..0000000000000 --- a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3aba3398fe064a3eab4331f88161c7480e848418 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..3a6c48f8c9880 --- /dev/null +++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1 deleted file mode 100644 index 575d75dbda8c5..0000000000000 --- a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3aba3398fe064a3eab4331f88161c7480e848418 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..3a6c48f8c9880 --- /dev/null +++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1 deleted file mode 100644 index 575d75dbda8c5..0000000000000 --- a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3aba3398fe064a3eab4331f88161c7480e848418 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..3a6c48f8c9880 --- /dev/null +++ b/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 deleted file mode 100644 index 6178556b31848..0000000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b41b53a3a2d299ce381a69d165381ca19f62912 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..92b9f87bef7a3 --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 @@ -0,0 +1 @@ +4d44e4edc4a7fb39f09b95b09f560a15976fa1ba \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1 deleted file mode 100644 index 575d75dbda8c5..0000000000000 --- a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3aba3398fe064a3eab4331f88161c7480e848418 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..3a6c48f8c9880 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/server/licenses/log4j-api-2.11.1.jar.sha1 b/server/licenses/log4j-api-2.11.1.jar.sha1 deleted file mode 100644 index 4b1bfffac179f..0000000000000 --- a/server/licenses/log4j-api-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -268f0fe4df3eefe052b57c87ec48517d64fb2a10 \ No newline at end of file diff --git a/server/licenses/log4j-api-2.11.2.jar.sha1 b/server/licenses/log4j-api-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..66c8058e1089b --- /dev/null +++ b/server/licenses/log4j-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +f5e9a2ffca496057d6891a3de65128efc636e26e \ No newline at end of file diff --git a/server/licenses/log4j-core-2.11.1.jar.sha1 b/server/licenses/log4j-core-2.11.1.jar.sha1 deleted file mode 100644 index 2fb8589380a03..0000000000000 --- a/server/licenses/log4j-core-2.11.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -592a48674c926b01a9a747c7831bcd82a9e6d6e4 \ No newline at end of file diff --git a/server/licenses/log4j-core-2.11.2.jar.sha1 b/server/licenses/log4j-core-2.11.2.jar.sha1 new file mode 100644 index 0000000000000..e96f8b6bd509f --- /dev/null +++ b/server/licenses/log4j-core-2.11.2.jar.sha1 @@ -0,0 +1 @@ +6c2fb3f5b7cd27504726aef1b674b542a0c9cf53 \ No newline at end of file