Skip to content

Commit d898a51

Browse files
slawekjaranowskislachiewicz
slawekjaranowski
authored and
slachiewicz
committed
Fix build
- fix configuration for pache-rat-plugin - add missing license headers
1 parent 71656a5 commit d898a51

File tree

8 files changed

+132
-33
lines changed

8 files changed

+132
-33
lines changed

‎apache-maven/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ under the License.
124124
<groupId>org.apache.rat</groupId>
125125
<artifactId>apache-rat-plugin</artifactId>
126126
<configuration>
127-
<excludes combine.children="append">
127+
<excludes>
128128
<exclude>src/bin/m2.conf</exclude>
129+
<!-- Excluded the license files itself cause they do not have a license of themselves. -->
130+
<exclude>src/main/appended-resources/licenses/**</exclude>
129131
</excludes>
130132
</configuration>
131133
</plugin>

‎maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
package org.apache.maven.embedder;
221

322

‎maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
package org.apache.maven.embedder;
221

322

‎maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
// CHECKSTYLE_OFF: RegexpHeader|LineLength
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
220
/**
321
* XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
422
* These classes use

‎maven-model/src/main/java/org/apache/maven/model/merge/package-info.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
// CHECKSTYLE_OFF: RegexpHeader
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
220
/**
321
* POM merger.
422
*/

‎maven-model/src/main/java/org/apache/maven/model/package-info.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
// CHECKSTYLE_OFF: RegexpHeader
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
220
/**
321
* Maven POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
422
* The root class is {@link org.apache.maven.model.Model}.

‎maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
// CHECKSTYLE_OFF: RegexpHeader
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with 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,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
220
/**
321
* <a href="https://maven.apache.org/resolver/">Maven Resolver</a> extensions for utilizing the Maven POM and Maven
422
* repository metadata.

‎pom.xml‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ under the License.
130130
<classWorldsVersion>2.9.0</classWorldsVersion>
131131
<commonsCliVersion>1.11.0</commonsCliVersion>
132132
<commonsIoVersion>2.21.0</commonsIoVersion>
133-
<junitVersion>4.13.2</junitVersion>
134133
<hamcrestVersion>3.0</hamcrestVersion>
135134
<mockitoVersion>4.11.0</mockitoVersion>
136135
<plexusVersion>2.2.0</plexusVersion>
@@ -597,6 +596,21 @@ under the License.
597596
</dependency>
598597
</dependencies>
599598
</plugin>
599+
<plugin>
600+
<groupId>org.apache.rat</groupId>
601+
<artifactId>apache-rat-plugin</artifactId>
602+
<configuration>
603+
<excludes>
604+
<exclude>**/.gitattributes</exclude>
605+
<exclude>src/test/resources*/**</exclude>
606+
<exclude>src/test/projects/**</exclude>
607+
<exclude>src/test/remote-repo/**</exclude>
608+
<exclude>**/*.odg</exclude>
609+
<exclude>**/*.svg</exclude>
610+
<exclude>.asf.yaml</exclude>
611+
</excludes>
612+
</configuration>
613+
</plugin>
600614
</plugins>
601615
</pluginManagement>
602616
<plugins>
@@ -635,33 +649,6 @@ under the License.
635649
</asfExtOptions>
636650
</configuration>
637651
</plugin>
638-
<plugin>
639-
<groupId>org.apache.rat</groupId>
640-
<artifactId>apache-rat-plugin</artifactId>
641-
<executions>
642-
<execution>
643-
<id>rat-check</id>
644-
<inherited>false</inherited>
645-
<configuration>
646-
<excludes>
647-
<exclude>**/.gitattributes</exclude>
648-
<exclude>src/test/resources*/**</exclude>
649-
<exclude>src/test/projects/**</exclude>
650-
<exclude>src/test/remote-repo/**</exclude>
651-
<exclude>**/*.odg</exclude>
652-
<exclude>**/*.svg</exclude>
653-
<exclude>.asf.yaml</exclude>
654-
<!--
655-
! Excluded the license files itself cause they do not have have a license of themselves.
656-
-->
657-
<exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
658-
<exclude>src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt</exclude>
659-
<exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
660-
</excludes>
661-
</configuration>
662-
</execution>
663-
</executions>
664-
</plugin>
665652
<plugin>
666653
<groupId>org.apache.maven.plugins</groupId>
667654
<artifactId>maven-enforcer-plugin</artifactId>

0 commit comments

Comments
 (0)