This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch retire-license-header-tests in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 9ef66ee312babeee082b02444a83d25060b018c6 Author: Emond Papegaaij <[email protected]> AuthorDate: Sat Oct 31 00:11:14 2026 +0100 Retire the per-module license header tests in favour of Apache RAT Every module carried an ApacheLicenceHeaderTest built on ApacheLicenseHeaderTestCase from wicket-util, each with its own ignore lists. The root build now checks license headers with Apache RAT over the whole source tree, the check the Apache Trusted Releases platform runs on a release, so these tests check a subset of the same thing a second time and their ignore lists have to be kept in step with .rat-excludes. The per-module tests are removed. ApacheLicenseHeaderTestCase is public API in wicket-util's main code, as is the ApacheLicenceHeaderTest that sits next to it, so both stay and are deprecated for removal instead. The tests also checked that HTML and XML files start with an XML prolog. That check goes with them; RAT does not replace it. An application that extends ApacheLicenseHeaderTestCase keeps working and gets a deprecation warning. Its replacement is Apache RAT in its own build; there is no mechanical migration, so no OpenRewrite recipe. Proposed migration guide text: "ApacheLicenseHeaderTestCase is deprecated for removal. Wicket checks its own license headers with Apache RAT; use apache-rat-plugin in your build instead." Merge after the change that adds Apache RAT to the build. GitHub issue #1723 Co-Authored-By: Claude Opus 5.5 <[email protected]> --- .../testing/ApacheLicenceHeaderTest.java | 36 ----- .../util/license/ApacheLicenceHeaderTest.java | 37 ----- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../util/license/ApacheLicenceHeaderTest.java | 54 -------- .../apache/wicket/cdi/ApacheLicenceHeaderTest.java | 59 -------- .../core/util/license/ApacheLicenceHeaderTest.java | 152 --------------------- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../util/license/ApacheLicenceHeaderTest.java | 103 -------------- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../util/license/ApacheLicenceHeaderTest.java | 54 -------- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../jmx/util/license/ApacheLicenceHeaderTest.java | 53 ------- .../ws/util/licence/ApacheLicenceHeaderTest.java | 51 ------- .../ws/util/licence/ApacheLicenceHeaderTest.java | 51 ------- .../ws/tester/licence/ApacheLicenceHeaderTest.java | 34 ----- .../util/license/ApacheLicenceHeaderTest.java | 34 ----- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../util/license/ApacheLicenceHeaderTest.java | 53 ------- .../util/license/ApacheLicenceHeaderTest.java | 3 + .../util/license/ApacheLicenseHeaderTestCase.java | 3 + .../util/license/ApacheLicenceHeaderTest.java | 53 ------- 21 files changed, 6 insertions(+), 1089 deletions(-) diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java deleted file mode 100644 index 8331475e50..0000000000 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 - * - * http://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.wicket.arquillian.testing; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - - } -} diff --git a/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 97733dccc2..0000000000 --- a/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 - * - * http://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.wicket.util.license; - - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - - xmlPrologIgnore.add("src/main/webapp/index.html"); - } -} diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/util/license/ApacheLicenceHeaderTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 18a59804dc..0000000000 --- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.authroles.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - htmlIgnore.add("src/main/java/org/apache/wicket/authroles/authentication/pages"); - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } -} diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/util/license/ApacheLicenceHeaderTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index ae824568da..0000000000 --- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 - * - * http://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.wicket.bean.validation.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - htmlIgnore.add("src/main/java/org/apache/wicket/authroles/authentication/pages"); - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java deleted file mode 100644 index ac46f25314..0000000000 --- a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 - * - * http://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.wicket.cdi; - -import java.util.Arrays; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run - * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific - * tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - xmlIgnore.add(".settings"); - xmlIgnore.add("src/main/resources/META-INF/beans.xml"); - xmlIgnore.add("src/test/java/simplelogger.properties"); - xmlPrologIgnore = Arrays.asList("src"); - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index ed9e9def94..0000000000 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * 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 - * - * http://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.wicket.core.util.license; - - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - ApacheLicenceHeaderTest() - { - // addHeaders = true; - - /* - * See NOTICE.txt - */ - htmlIgnore.add("src/main/java/org/apache/wicket/util/diff"); - htmlIgnore.add("src/main/java/org/apache/wicket/markup/html/pages"); - - // the licence header breaks the tests in IE - htmlIgnore.add("src/test/js/all.html"); - - /* - * See NOTICE.txt - */ - xmlPrologIgnore.add("src/main/java/org/apache/wicket/util/diff"); - // the xml prolog breaks the tests in IE - xmlPrologIgnore.add("src/test/js/all.html"); - xmlPrologIgnore.add("src/test/js/amd.html"); - - /* - * .css in test is very test specific and a license header would confuse and make it unclear - * what the test is about. - */ - cssIgnore.add("src/test/java"); - cssIgnore.add("src/test/js/qunit/qunit.css"); - - xmlIgnore.add("src/assembly/bin.xml"); - - /* - * ASL1.1. Taken from Maven JRCS. See NOTICE.txt - */ - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/AddDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ChangeDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Chunk.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DeleteDelta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Delta.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Diff.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DifferentiationFailedException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/DiffException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/PatchFailedException.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/Revision.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/RevisionVisitor.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/ToString.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/PathNode.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/diff/myers/Snake.java"); - /* - * Needs to be resolved (rewritten or NOTICE) - */ - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/ConcurrentReaderHashMap.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/ConcurrentHashMap.java"); - javaIgnore.add("src/main/java/org/apache/wicket/util/concurrent/CopyOnWriteArrayList.java"); - - javaIgnore.add("src/main/java/org/apache/wicket/ajax/json"); - - javaScriptIgnore.add("src/site/xdoc/onestat.js"); - - /* - * .js in test is very test specific and a license header would confuse and make it unclear - * what the test is about. - */ - javaScriptIgnore.add("src/test/java"); - /* - * See NOTICE.txt - */ - javaScriptIgnore.add("src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js"); - javaScriptIgnore.add("src/main/java/org/apache/wicket/resource/jquery"); - javaScriptIgnore.add("src/test/js/qunit/qunit.js"); - javaScriptIgnore.add("src/test/js/qunit/jquery.mockjax.js"); - javaScriptIgnore.add("src/test/js/qunit/blanket.min.js"); - javaScriptIgnore.add("src/test/js/data/ajax/nonWicketResponse.json"); // no way to add licence in JSON - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - /** - * Checks the license headers of wicket-core-tests. - */ - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - - /** - * Checks the license headers of wicket-core. - */ - @Test - public void checkWicketCoreLicenseHeaders() - { - final String propertyName = "basedir"; - final String basedir = System.getProperty(propertyName); - try - { - System.setProperty(propertyName, "../wicket-core"); - super.before(); - super.licenseHeaders(); - } - finally - { - if (basedir == null) { - System.clearProperty(propertyName); - } else { - System.setProperty(propertyName, basedir); - } - } - } -} diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/util/license/ApacheLicenceHeaderTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 448ffdba6e..0000000000 --- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.devutils.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 372eb451fd..0000000000 --- a/wicket-examples/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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 - * - * http://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.wicket.util.license; - -import java.util.Arrays; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - - /* - * This is an example project. Therefore we'd rather not have license headers in html files, - * because it removes the focus away from what the example is about. - */ - htmlIgnore = Arrays.asList("src"); - - /* same, same */ - velocityIgnore = Arrays.asList("src"); - - /* - * Prototype, released under MIT. See NOTICE - */ - javaScriptIgnore.add("src/main/webapp/prototype.js"); - /* - * jQuery UI, released under MIT. See NOTICE - */ - javaScriptIgnore.add("src/main/webapp/jquery-ui-v1.14.2.custom.js"); - /* - * Behaviour, released under BSD. See NOTICE - */ - javaScriptIgnore.add("src/main/java/org/apache/wicket/examples/preview/behaviour.js"); - /* - * DOJO is dual licensed. We use the BSD license. See NOTICE. - */ - javaScriptIgnore.add("src/main/java/org/apache/wicket/examples/preview/dojo.js"); - - /** - * QUnit and jQuery used for tests - MIT licence. See NOTICE - */ - javaScriptIgnore.add("src/main/webapp/js-test/lib/qunit.js"); - javaScriptIgnore.add("src/main/webapp/js-test/lib/jquery.js"); - - cssIgnore.add("src/main/webapp/js-test/lib/qunit.css"); - - /* - * Part of an example - */ - xmlIgnore.add("src/main/java/org/apache/wicket/examples/compref/XmlPage.xml"); - xmlIgnore.add(".settings"); - - /* - * Configuration files with no "intelligent" content - */ - propertiesIgnore.add("src/main/java/commons-logging.properties"); - propertiesIgnore.add("src/main/java/simplelogger.properties"); - - xmlPrologIgnore = Arrays.asList("src"); - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/util/license/ApacheLicenceHeaderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 675532b000..0000000000 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.extensions.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/util/license/ApacheLicenceHeaderTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 53c8e082ac..0000000000 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 - * - * http://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.wicket.guice.util.license; - - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/util/license/ApacheLicenceHeaderTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 547041c269..0000000000 --- a/wicket-ioc/src/test/java/org/apache/wicket/injection/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.injection.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-jmx/src/test/java/org/apache/wicket/jmx/util/license/ApacheLicenceHeaderTest.java b/wicket-jmx/src/test/java/org/apache/wicket/jmx/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index e65a946996..0000000000 --- a/wicket-jmx/src/test/java/org/apache/wicket/jmx/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.jmx.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java deleted file mode 100644 index 20a8a7368e..0000000000 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 - * - * http://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.wicket.protocol.ws.util.licence; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java b/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java deleted file mode 100644 index 20a8a7368e..0000000000 --- a/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/util/licence/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 - * - * http://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.wicket.protocol.ws.util.licence; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-native-websocket/wicket-native-websocket-tester/src/test/java/org/apache/wicket/protocol/ws/tester/licence/ApacheLicenceHeaderTest.java b/wicket-native-websocket/wicket-native-websocket-tester/src/test/java/org/apache/wicket/protocol/ws/tester/licence/ApacheLicenceHeaderTest.java deleted file mode 100644 index 1378266cc9..0000000000 --- a/wicket-native-websocket/wicket-native-websocket-tester/src/test/java/org/apache/wicket/protocol/ws/tester/licence/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 - * - * http://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.wicket.protocol.ws.tester.licence; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } -} diff --git a/wicket-objectsizeof-agent/src/test/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-objectsizeof-agent/src/test/wicket/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 948a4951fc..0000000000 --- a/wicket-objectsizeof-agent/src/test/wicket/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 - * - * http://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 wicket.util.license; - -/** - * Test that the license headers are in place in this project. The tests are run - * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific - * tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase { - - /** - * Construct. - */ - public ApacheLicenceHeaderTest() { - xmlIgnore = new String[] { ".settings" }; - } -} diff --git a/wicket-request/src/test/java/org/apache/wicket/request/util/license/ApacheLicenceHeaderTest.java b/wicket-request/src/test/java/org/apache/wicket/request/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 5fa83dba6e..0000000000 --- a/wicket-request/src/test/java/org/apache/wicket/request/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.request.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/util/license/ApacheLicenceHeaderTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 811d7bf7d2..0000000000 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.spring.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - * - * @author Frank Bille Jensen (frankbille) - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -} diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java index 0a243c0c57..99d11980d4 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java @@ -21,7 +21,10 @@ package org.apache.wicket.util.license; * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. * * @author Frank Bille Jensen (frankbille) + * @deprecated Wicket checks its license headers with Apache RAT, configured in the root pom and + * in {@code .rat-excludes}. */ +@Deprecated(since = "10.12.0, 11.0.0", forRemoval = true) public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase { /** diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java index 7bd89774ad..0d0929643a 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java @@ -35,7 +35,10 @@ import org.slf4j.LoggerFactory; * Doesn't really make sense outside org.apache.wicket. * * @author Frank Bille Jensen (frankbille) + * @deprecated Wicket checks its license headers with Apache RAT, configured in the root pom and + * in {@code .rat-excludes}. Use Apache RAT in your own build instead. */ +@Deprecated(since = "10.12.0, 11.0.0", forRemoval = true) public abstract class ApacheLicenseHeaderTestCase { /** Log. */ diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/util/license/ApacheLicenceHeaderTest.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/util/license/ApacheLicenceHeaderTest.java deleted file mode 100644 index 16a42a3c46..0000000000 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/util/license/ApacheLicenceHeaderTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - * - * http://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.wicket.contrib.util.license; - -import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Test that the license headers are in place in this project. The tests are run from - * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed. - */ -public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase -{ - /** - * Construct. - */ - public ApacheLicenceHeaderTest() - { - // addHeaders = true; - - velocityIgnore.add("src/test/java/org/apache/wicket/contrib/velocity/testTemplate.vm"); - } - - @BeforeEach - @Override - public void before() - { - super.before(); - } - - @Test - @Override - public void licenseHeaders() - { - super.licenseHeaders(); - } - -}
