Skip to content

Commit f828996

Browse files
committed
CAMEL-11194 Upgrade Checkstyle and update rules
This reformats the license headers in files to their appropriate definitions generated from `buildtools/header.txt`.
1 parent 690e71c commit f828996

File tree

3,740 files changed

+29599
-23476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,740 files changed

+29599
-23476
lines changed

apache-camel/pom.xml

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
93
10-
http://www.apache.org/licenses/LICENSE-2.0
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
1118
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
1719
-->
1820
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1921

apache-camel/src/main/descriptors/common-bin.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3+
34
Licensed to the Apache Software Foundation (ASF) under one or more
45
contributor license agreements. See the NOTICE file distributed with
56
this work for additional information regarding copyright ownership.
67
The ASF licenses this file to You under the Apache License, Version 2.0
78
(the "License"); you may not use this file except in compliance with
89
the License. You may obtain a copy of the License at
910
10-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1112
1213
Unless required by applicable law or agreed to in writing, software
1314
distributed under the License is distributed on an "AS IS" BASIS,
1415
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1516
See the License for the specific language governing permissions and
1617
limitations under the License.
18+
1719
-->
1820
<component>
1921

apache-camel/src/main/descriptors/src.xml

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
3+
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
1719
-->
1820
<assembly>
1921
<id>src</id>

apache-camel/src/main/descriptors/unix-bin.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3+
34
Licensed to the Apache Software Foundation (ASF) under one or more
45
contributor license agreements. See the NOTICE file distributed with
56
this work for additional information regarding copyright ownership.
67
The ASF licenses this file to You under the Apache License, Version 2.0
78
(the "License"); you may not use this file except in compliance with
89
the License. You may obtain a copy of the License at
910
10-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1112
1213
Unless required by applicable law or agreed to in writing, software
1314
distributed under the License is distributed on an "AS IS" BASIS,
1415
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1516
See the License for the specific language governing permissions and
1617
limitations under the License.
18+
1719
-->
1820
<assembly>
1921
<id>unix-bin</id>

apache-camel/src/main/descriptors/windows-bin.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3+
34
Licensed to the Apache Software Foundation (ASF) under one or more
45
contributor license agreements. See the NOTICE file distributed with
56
this work for additional information regarding copyright ownership.
67
The ASF licenses this file to You under the Apache License, Version 2.0
78
(the "License"); you may not use this file except in compliance with
89
the License. You may obtain a copy of the License at
910
10-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1112
1213
Unless required by applicable law or agreed to in writing, software
1314
distributed under the License is distributed on an "AS IS" BASIS,
1415
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1516
See the License for the specific language governing permissions and
1617
limitations under the License.
18+
1719
-->
1820
<assembly>
1921
<id>windows-bin</id>

archetypes/camel-archetype-activemq/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/data/message1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/data/message2.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/data/message3.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j2.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## (the "License"); you may not use this file except in compliance with
77
## the License. You may obtain a copy of the License at
88
##
9-
## http://www.apache.org/licenses/LICENSE-2.0
9+
## http://www.apache.org/licenses/LICENSE-2.0
1010
##
1111
## Unless required by applicable law or agreed to in writing, software
1212
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-api-component/pom.xml

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
3+
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
19+
-->
1820
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1921

2022
<modelVersion>4.0.0</modelVersion>

archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
93
10-
http://www.apache.org/licenses/LICENSE-2.0
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
1110
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
19+
-->
1820
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="camel-archetype-api-component"
1921
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
2022
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j2.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## (the "License"); you may not use this file except in compliance with
77
## the License. You may obtain a copy of the License at
88
##
9-
## http://www.apache.org/licenses/LICENSE-2.0
9+
## http://www.apache.org/licenses/LICENSE-2.0
1010
##
1111
## Unless required by applicable law or agreed to in writing, software
1212
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/test-options.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# TODO provide test values for ${name} configuration properties
1+
## ---------------------------------------------------------------------------## 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.## ---------------------------------------------------------------------------# TODO provide test values for ${name} configuration properties

archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-blueprint/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint-bean.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## (the "License"); you may not use this file except in compliance with
77
## the License. You may obtain a copy of the License at
88
##
9-
## http://www.apache.org/licenses/LICENSE-2.0
9+
## http://www.apache.org/licenses/LICENSE-2.0
1010
##
1111
## Unless required by applicable law or agreed to in writing, software
1212
## distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(the "License"); you may not use this file except in compliance with
99
the License. You may obtain a copy of the License at
1010
11-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1212
1313
Unless required by applicable law or agreed to in writing, software
1414
distributed under the License is distributed on an "AS IS" BASIS,

archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## (the "License"); you may not use this file except in compliance with
88
## the License. You may obtain a copy of the License at
99
##
10-
## http://www.apache.org/licenses/LICENSE-2.0
10+
## http://www.apache.org/licenses/LICENSE-2.0
1111
##
1212
## Unless required by applicable law or agreed to in writing, software
1313
## distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)