From 1f92db28093cfe28aeea5fc0ead7df278b1d9896 Mon Sep 17 00:00:00 2001 From: Craig L Russell Date: Sat, 2 May 2026 20:53:49 -0700 Subject: [PATCH 1/2] Fix Apache license headers to use full ASF standard header Replace shortened Apache License 2.0 headers with the full standard ASF header that includes the 'Licensed to the Apache Software Foundation (ASF)' preamble and NOTICE file reference. Also add missing headers to two files in tck/src that had none. Co-Authored-By: Claude Sonnet 4.6 --- .../org/apache/jdo/exectck/AbstractTCKMojo.java | 11 +++++++---- .../org/apache/jdo/exectck/InstallSchema.java | 11 +++++++---- .../org/apache/jdo/exectck/PropertyUtils.java | 11 +++++++---- .../java/org/apache/jdo/exectck/RunTCK.java | 11 +++++++---- .../org/apache/jdo/exectck/SQLFileLoader.java | 11 +++++++---- .../util/DefaultListableInstanceFactory.java | 17 +++++++++++++++++ .../tck/util/TCKSummaryGeneratingListener.java | 17 +++++++++++++++++ 7 files changed, 69 insertions(+), 20 deletions(-) diff --git a/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java index cbeb3072..73068dee 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java @@ -1,9 +1,12 @@ /* - * 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 + * 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 * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java index a0c718e7..2d43eba6 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java @@ -1,9 +1,12 @@ /* - * 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 + * 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 * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java b/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java index 78d0e104..5b00aae2 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/PropertyUtils.java @@ -1,9 +1,12 @@ /* - * 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 + * 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 * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java index 09aabdf5..5e4d3a28 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java @@ -1,9 +1,12 @@ /* - * 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 + * 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 * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java b/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java index ddee82ee..03b9dc62 100644 --- a/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java +++ b/exectck/src/main/java/org/apache/jdo/exectck/SQLFileLoader.java @@ -1,9 +1,12 @@ /* - * 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 + * 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 * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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/tck/src/main/java/org/apache/jdo/tck/util/DefaultListableInstanceFactory.java b/tck/src/main/java/org/apache/jdo/tck/util/DefaultListableInstanceFactory.java index bee9e272..28419805 100644 --- a/tck/src/main/java/org/apache/jdo/tck/util/DefaultListableInstanceFactory.java +++ b/tck/src/main/java/org/apache/jdo/tck/util/DefaultListableInstanceFactory.java @@ -1,3 +1,20 @@ +/* + * 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 + * + * 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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.jdo.tck.util; import java.lang.reflect.Constructor; diff --git a/tck/src/main/java/org/apache/jdo/tck/util/TCKSummaryGeneratingListener.java b/tck/src/main/java/org/apache/jdo/tck/util/TCKSummaryGeneratingListener.java index 1a166616..55682a79 100644 --- a/tck/src/main/java/org/apache/jdo/tck/util/TCKSummaryGeneratingListener.java +++ b/tck/src/main/java/org/apache/jdo/tck/util/TCKSummaryGeneratingListener.java @@ -1,3 +1,20 @@ +/* + * 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 + * + * 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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.jdo.tck.util; import org.junit.platform.launcher.TestPlan; From be56e1a401355b44774d346369ac2ceb84307292 Mon Sep 17 00:00:00 2001 From: Craig L Russell Date: Mon, 4 May 2026 16:06:09 -0700 Subject: [PATCH 2/2] Update .rat-excludes Exclude .gitignore and META-INF/services from license checks --- .rat-excludes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rat-excludes b/.rat-excludes index ab6219d7..4accde67 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -15,6 +15,8 @@ specification/* specification/OOO/* specification/imports/* +**/.gitignore +**/META-INF/services/* assembly.xml datanucleus.txt query.ser