This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new 729be8217 re-enable ASF header check
729be8217 is described below
commit 729be82171cddfbd55abb498ae3021fa59f96a3f
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Tue Sep 19 10:51:23 2023 +0200
re-enable ASF header check
but this time we do it inline.
---
pom.xml | 13 +----------
.../ValidatingInjectionTargetFactory.java | 26 ++++++++++++----------
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 22c81da48..76960e323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,12 +442,10 @@
<!-- Checks for Headers
-->
<!-- See
http://checkstyle.sf.net/config_header.html -->
-<!--X disabled for now
<module name="Header">
- <property name="headerFile"
value="${checkstyle.header.file}"/>
+ <property name="header" value="/*\n *
Licensed to the Apache Software Foundation (ASF) under one\n * or more
contributor license agreements. See the NOTICE file\n * distributed with this
work for additional information\n * regarding copyright ownership. The ASF
licenses this file\n * to you under the Apache License, Version 2.0 (the\n *
&quot;License&quot;); you may not use this file except in compliance\n
* with the License. You may obtain [...]
<property name="fileExtensions"
value="java"/>
</module>
--->
<!-- Checks for Size Violations.
-->
<!-- See
http://checkstyle.sf.net/config_sizes.html -->
@@ -602,15 +600,6 @@
<consoleOutput>true</consoleOutput>
<excludes>**/Unsafe*</excludes> <!-- we abuse of switch
and checkstyle is broken for it -->
</configuration>
- <!--
- <dependencies>
- <dependency>
-
<groupId>org.apache.openwebbeans.build-tools</groupId>
-
<artifactId>checkstyle-rules</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- -->
</plugin>
<plugin>
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
index 73e42b090..3a51cb5d9 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/ValidatingInjectionTargetFactory.java
@@ -1,18 +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
+ * 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
+ * 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.
+ * 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.webbeans.container;
