Merge branch 'main' into 438-upgrade-java-version

gchq · Jan 10, 2023 · 12bd075 · 12bd075
2 parents 182cb50 + a66dff8
commit 12bd075
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 19 deletions.
diff --git a/code-style/intellij-copyright-profile.xml b/code-style/intellij-copyright-profile.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright 2022-&amp;#36;today.year Crown Copyright&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="myName" value="sleeper" />
+  </copyright>
+</component>
diff --git a/example/full/instance.properties b/example/full/instance.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Crown Copyright
+# Copyright 2022-2023 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/java/build/src/main/java/sleeper/build/chunks/ProjectChunks.java b/java/build/src/main/java/sleeper/build/chunks/ProjectChunks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/main/java/sleeper/build/chunks/ProjectStructure.java b/java/build/src/main/java/sleeper/build/chunks/ProjectStructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/main/java/sleeper/build/github/actions/GitHubActionsChunkWorkflow.java b/java/build/src/main/java/sleeper/build/github/actions/GitHubActionsChunkWorkflow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/main/java/sleeper/build/github/actions/OnPushPathsDiff.java b/java/build/src/main/java/sleeper/build/github/actions/OnPushPathsDiff.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffExtraEntriesTest.java b/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffExtraEntriesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffTest.java b/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffTestHelper.java b/java/build/src/test/java/sleeper/build/github/actions/OnPushPathsDiffTestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/build/src/test/java/sleeper/build/testutil/TestProjectStructure.java b/java/build/src/test/java/sleeper/build/testutil/TestProjectStructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/compaction/compaction-job-execution/pom.xml b/java/compaction/compaction-job-execution/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 Crown Copyright
+  ~ Copyright 2022-2023 Crown Copyright
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/java/configuration/src/main/java/sleeper/configuration/Utils.java b/java/configuration/src/main/java/sleeper/configuration/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/configuration/src/main/java/sleeper/configuration/properties/SleeperProperties.java b/java/configuration/src/main/java/sleeper/configuration/properties/SleeperProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...iguration/src/main/java/sleeper/configuration/properties/UserDefinedInstanceProperty.java b/...iguration/src/main/java/sleeper/configuration/properties/UserDefinedInstanceProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/core/src/main/java/sleeper/core/partition/PartitionTree.java b/java/core/src/main/java/sleeper/core/partition/PartitionTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/ingest/ingest-runner/src/main/java/sleeper/ingest/IngestFactory.java b/java/ingest/ingest-runner/src/main/java/sleeper/ingest/IngestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../main/java/sleeper/ingest/impl/partitionfilewriter/AsyncS3PartitionFileWriterFactory.java b/.../main/java/sleeper/ingest/impl/partitionfilewriter/AsyncS3PartitionFileWriterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/ingest/ingest-runner/src/main/java/sleeper/ingest/job/ECSIngestTask.java b/java/ingest/ingest-runner/src/main/java/sleeper/ingest/job/ECSIngestTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2022-2023 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/java/pom.xml b/java/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 Crown Copyright
+  ~ Copyright 2022-2023 Crown Copyright
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/scripts/test/system-test-instance.properties b/scripts/test/system-test-instance.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Crown Copyright
+# Copyright 2022-2023 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.