Merge branch 'assembly-temp' into assembly

apolloconfig · Jan 12, 2024 · 31657f3 · 31657f3
2 parents 08da155 + e24336a
commit 31657f3
Show file tree

Hide file tree

Showing 932 changed files with 1,786 additions and 2,676 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.github/stale.yml b/.github/stale.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/.licenserc.yaml b/.licenserc.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"  encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 Apollo Authors
+  ~ Copyright 2024 Apollo Authors
   ~
   ~ 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/apollo-adminservice/src/assembly/assembly-descriptor.xml b/apollo-adminservice/src/assembly/assembly-descriptor.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2023 Apollo Authors
+  ~ Copyright 2024 Apollo Authors
   ~
   ~ 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/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/...ervice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java b/...ervice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...dminServiceAssemblyAutoConfiguration.java → ...ce/AdminServiceAssemblyConfiguration.java b/...dminServiceAssemblyAutoConfiguration.java → ...ce/AdminServiceAssemblyConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 @Profile("assembly")
 @Configuration
-public class AdminServiceAssemblyAutoConfiguration {
+public class AdminServiceAssemblyConfiguration {
 
   @Order(99)
   @Configuration

diff --git a/.../src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java b/.../src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceHealthIndicator.java b/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceHealthIndicator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...dminservice/src/main/java/com/ctrip/framework/apollo/adminservice/ServletInitializer.java b/...dminservice/src/main/java/com/ctrip/framework/apollo/adminservice/ServletInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceAcquireLockAspect.java b/...src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceAcquireLockAspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...vice/src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspect.java b/...vice/src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/aop/PreAcquireNamespaceLock.java b/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/aop/PreAcquireNamespaceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...src/main/java/com/ctrip/framework/apollo/adminservice/controller/AccessKeyController.java b/...src/main/java/com/ctrip/framework/apollo/adminservice/controller/AccessKeyController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...rvice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppController.java b/...rvice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java b/.../main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java b/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/controller/CommitController.java b/...ce/src/main/java/com/ctrip/framework/apollo/adminservice/controller/CommitController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/IndexController.java b/...ice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/IndexController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ain/java/com/ctrip/framework/apollo/adminservice/controller/InstanceConfigController.java b/...ain/java/com/ctrip/framework/apollo/adminservice/controller/InstanceConfigController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...vice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java b/...vice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetController.java b/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...in/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceBranchController.java b/...in/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceBranchController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceController.java b/...src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/com/ctrip/framework/apollo/adminservice/controller/NamespaceLockController.java b/...main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceLockController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java b/...e/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...ain/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java b/...ain/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/com/ctrip/framework/apollo/adminservice/controller/ServerConfigController.java b/.../main/java/com/ctrip/framework/apollo/adminservice/controller/ServerConfigController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/com/ctrip/framework/apollo/adminservice/filter/AdminServiceAuthenticationFilter.java b/...java/com/ctrip/framework/apollo/adminservice/filter/AdminServiceAuthenticationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/apollo-adminservice/src/main/resources/adminservice.properties b/apollo-adminservice/src/main/resources/adminservice.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-consul-discovery.properties b/apollo-adminservice/src/main/resources/application-consul-discovery.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-custom-defined-discovery.properties b/apollo-adminservice/src/main/resources/application-custom-defined-discovery.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-database-discovery.properties b/apollo-adminservice/src/main/resources/application-database-discovery.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-github.properties b/apollo-adminservice/src/main/resources/application-github.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-kubernetes.properties b/apollo-adminservice/src/main/resources/application-kubernetes.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-nacos-discovery.properties b/apollo-adminservice/src/main/resources/application-nacos-discovery.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application-zookeeper-discovery.properties b/apollo-adminservice/src/main/resources/application-zookeeper-discovery.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application.properties b/apollo-adminservice/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/application.yml b/apollo-adminservice/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/resources/logback.xml b/apollo-adminservice/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 Apollo Authors
+  ~ Copyright 2024 Apollo Authors
   ~
   ~ 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/apollo-adminservice/src/main/scripts/shutdown.sh b/apollo-adminservice/src/main/scripts/shutdown.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2023 Apollo Authors
+# Copyright 2024 Apollo Authors
 #
 # 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/...-adminservice/src/test/java/com/ctrip/framework/apollo/AdminServiceTestConfiguration.java b/...-adminservice/src/test/java/com/ctrip/framework/apollo/AdminServiceTestConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...o-adminservice/src/test/java/com/ctrip/framework/apollo/LocalAdminServiceApplication.java b/...o-adminservice/src/test/java/com/ctrip/framework/apollo/LocalAdminServiceApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...nservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceLockTest.java b/...nservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceLockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/.../src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspectTest.java b/.../src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/.../test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java b/.../test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...e/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java b/...e/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...t/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceControllerTest.java b/...t/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * 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/...c/test/java/com/ctrip/framework/apollo/adminservice/controller/ClusterControllerTest.java b/...c/test/java/com/ctrip/framework/apollo/adminservice/controller/ClusterControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Apollo Authors
+ * Copyright 2024 Apollo Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.