This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new cb5ff2aace Fix aot license (#13562)
cb5ff2aace is described below
commit cb5ff2aace600817868b238da048c85f66e837bb
Author: huazhongming <crazy...@gmail.com>
AuthorDate: Mon Dec 25 12:57:01 2023 +0800
Fix aot license (#13562)
* Fix ExecutableDescriber class path
Signed-off-by: crazyhzm <crazy...@gmail.com>
* Fix aot license
Signed-off-by: crazyhzm <crazy...@gmail.com>
---------
Signed-off-by: crazyhzm <crazy...@gmail.com>
---
.../dubbo/aot/{generate => api}/ExecutableDescriber.java | 5 +----
.../main/java/org/apache/dubbo/aot/api/ExecutableMode.java | 13 ++++++-------
.../main/java/org/apache/dubbo/aot/api/MemberCategory.java | 13 ++++++-------
.../main/java/org/apache/dubbo/aot/api/TypeDescriber.java | 2 --
.../dubbo/aot/generate/ReflectConfigMetadataRepository.java | 1 +
.../apache/dubbo/aot/generate/ReflectionConfigWriter.java | 1 +
pom.xml | 4 ++--
7 files changed, 17 insertions(+), 22 deletions(-)
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ExecutableDescriber.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableDescriber.java
similarity index 94%
rename from
dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ExecutableDescriber.java
rename to
dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableDescriber.java
index 8e9bebd7d6..86a91b4e70 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ExecutableDescriber.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableDescriber.java
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.aot.generate;
-
-import org.apache.dubbo.aot.api.ExecutableMode;
-import org.apache.dubbo.aot.api.MemberDescriber;
+package org.apache.dubbo.aot.api;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java
index b9af8148a9..a8b23a85f6 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java
@@ -1,12 +1,11 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright 2002-2022 the original author or authors.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java
index ddf64b5e30..6a113bc38c 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java
@@ -1,12 +1,11 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright 2002-2023 the original author or authors.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/TypeDescriber.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/TypeDescriber.java
index e8fab121e4..782f6df76d 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/TypeDescriber.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/api/TypeDescriber.java
@@ -16,8 +16,6 @@
*/
package org.apache.dubbo.aot.api;
-import org.apache.dubbo.aot.generate.ExecutableDescriber;
-
import java.util.Set;
/**
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectConfigMetadataRepository.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectConfigMetadataRepository.java
index c0bc5639a2..ae6c42b2a6 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectConfigMetadataRepository.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectConfigMetadataRepository.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.aot.generate;
+import org.apache.dubbo.aot.api.ExecutableDescriber;
import org.apache.dubbo.aot.api.MemberCategory;
import org.apache.dubbo.aot.api.TypeDescriber;
diff --git
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectionConfigWriter.java
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectionConfigWriter.java
index 0bfae969e9..61448f724c 100644
---
a/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectionConfigWriter.java
+++
b/dubbo-plugin/dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ReflectionConfigWriter.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.aot.generate;
+import org.apache.dubbo.aot.api.ExecutableDescriber;
import org.apache.dubbo.aot.api.ExecutableMode;
import org.apache.dubbo.aot.api.FieldDescriber;
import org.apache.dubbo.aot.api.MemberCategory;
diff --git a/pom.xml b/pom.xml
index 94b85f0ccc..db9e43a790 100644
--- a/pom.xml
+++ b/pom.xml
@@ -858,8 +858,8 @@
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunArguments.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunProcess.java</exclude>
<exclude>src/main/java/org/apache/dubbo/aot/generate/BasicJsonWriter.java</exclude>
-
<exclude>src/main/java/org/apache/dubbo/aot/generate/ExecutableMode.java</exclude>
-
<exclude>src/main/java/org/apache/dubbo/aot/generate/MemberCategory.java</exclude>
+
<exclude>src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java</exclude>
+
<exclude>src/main/java/org/apache/dubbo/aot/api/MemberCategory.java</exclude>
<exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java</exclude>
<exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/logger/helpers/FormattingTuple.java</exclude>
