Skip to content

Commit 6e36212

Browse files
authored
chore: regenerate per-submodule NOTICE files for parent v51 + lang3 (#112)
Problem: #111 regenerated the root NOTICE for the parent v51 + commons-lang -> commons-lang3 work but missed the per-submodule NOTICE files. Running `mvn notice:check` on master fails on courses-portlet-api with 'Existing NOTICE file ... doesn't match expected NOTICE file', which would block `mvn release:prepare` for 2.1.1. Goal: bring every reactor module's NOTICE in sync with its actual dep tree so notice:check passes across the full reactor. Changes: - courses-portlet-api/NOTICE, courses-portlet-dao/NOTICE, courses-portlet-webapp/NOTICE: regenerated via `mvn notice:generate` to pick up the post-v51 license metadata (Apache Commons Lang under Apache-2.0; Joda-Time / SLF4J license-name normalization). - Verified `mvn notice:check` is now green on all four reactor modules (root + 3 submodules).
1 parent 865396c commit 6e36212

3 files changed

Lines changed: 32 additions & 25 deletions

File tree

courses-portlet-api/NOTICE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ specific language governing permissions and limitations
1616
under the License.
1717

1818
This project includes:
19-
Commons Lang under The Apache Software License, Version 2.0
19+
Apache Commons Lang under Apache-2.0
2020
CoursePortlet - API under Apache License Version 2.0
2121
Hamcrest Core under New BSD License
2222
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
2323
javax.annotation API under CDDL + GPLv2 with classpath exception
2424
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
2525
JAXB2 Basics - Runtime under BSD-Style License
26-
Joda time under Apache 2
26+
Joda-Time under Apache License, Version 2.0
2727
JUnit under Eclipse Public License 1.0
28-
SLF4J API Module under MIT License
28+
SLF4J API Module under MIT
2929

courses-portlet-dao/NOTICE

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ under the License.
1717

1818
This project includes:
1919
AOP alliance under Public Domain
20-
Apache Commons Codec under Apache License, Version 2.0
20+
Apache Commons Codec under Apache-2.0
21+
Apache Commons Lang under Apache-2.0
2122
Byte Buddy (without dependencies) under Apache License, Version 2.0
2223
Byte Buddy agent under Apache License, Version 2.0
23-
Commons Lang under The Apache Software License, Version 2.0
2424
CoursePortlet - API under Apache License Version 2.0
2525
CoursePortlet - Data Access Objects for SIS/LMS integration under Apache License Version 2.0
2626
Ehcache Core under The Apache Software License, Version 2.0
2727
Hamcrest Core under New BSD License
2828
Jakarta Activation under EDL 1.0
2929
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
3030
Java Portlet Specification V2.0 under Commons Development and Distribution License, Version 1.0
31+
Java Servlet API under CDDL + GPLv2 with classpath exception
3132
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
3233
javax.annotation API under CDDL + GPLv2 with classpath exception
3334
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
3435
JAXB2 Basics - Runtime under BSD-Style License
35-
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
36-
Joda time under Apache 2
37-
JUL to SLF4J bridge under MIT License
36+
JCL 1.2 implemented over SLF4J under Apache-2.0
37+
Joda-Time under Apache License, Version 2.0
38+
JUL to SLF4J bridge under MIT
3839
JUnit under Eclipse Public License 1.0
39-
Log4j Implemented Over SLF4J under Apache Software Licenses
40+
Log4j Implemented Over SLF4J under Apache-2.0
4041
mockito-core under The MIT License
4142
Objenesis under Apache License, Version 2.0
4243
Old JAXB Runtime under Eclipse Distribution License - v 1.0
43-
servlet-api under Commons Development and Distribution License, Version 1.0
44-
SLF4J API Module under MIT License
44+
SLF4J API Module under MIT
4545
Spring AOP under The Apache Software License, Version 2.0
4646
Spring Beans under The Apache Software License, Version 2.0
4747
Spring Context under The Apache Software License, Version 2.0

courses-portlet-webapp/NOTICE

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ specific language governing permissions and limitations
1616
under the License.
1717

1818
This project includes:
19+
AntLR under BSD License
1920
AOP alliance under Public Domain
20-
Apache Commons Codec under Apache License, Version 2.0
21-
Apache Commons Collections under Apache License, Version 2.0
21+
Apache Commons Codec under Apache-2.0
22+
Apache Commons Compress under Apache-2.0
23+
Apache Commons FileUpload under Apache License, Version 2.0
24+
Apache Commons Lang under Apache-2.0
2225
Apache HttpClient under Apache License, Version 2.0
2326
Apache HttpCore under Apache License, Version 2.0
2427
Apache WSS4J under The Apache Software License, Version 2.0
@@ -28,19 +31,21 @@ This project includes:
2831
Bouncy Castle Provider under Bouncy Castle Licence
2932
Byte Buddy (without dependencies) under Apache License, Version 2.0
3033
Byte Buddy agent under Apache License, Version 2.0
31-
Commons FileUpload under The Apache Software License, Version 2.0
3234
Commons IO under The Apache Software License, Version 2.0
3335
Commons Lang under The Apache Software License, Version 2.0
34-
Commons Logging under The Apache Software License, Version 2.0
36+
commons-collections under Apache License, Version 2.0
3537
CoursePortlet - API under Apache License Version 2.0
3638
CoursePortlet - Data Access Objects for SIS/LMS integration under Apache License Version 2.0
3739
CoursePortlet - Webapp under Apache License Version 2.0
3840
Cryptacular Library under Apache 2 or GNU Lesser General Public License
41+
dom4j under BSD License
3942
ehcache under The Apache Software License, Version 2.0
4043
Ehcache Core under The Apache Software License, Version 2.0
4144
Ehcache Web Filters under The Apache Software License, Version 2.0
45+
Esbuild wrapper for Java bundled with original binaries under MIT License
4246
Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
4347
Hamcrest Core under New BSD License
48+
Hibernate Core under GNU Lesser General Public License
4449
Jackson module: Old JAXB Annotations (javax.xml.bind) under The Apache Software License, Version 2.0
4550
Jackson-annotations under The Apache Software License, Version 2.0
4651
Jackson-core under The Apache Software License, Version 2.0
@@ -50,21 +55,23 @@ This project includes:
5055
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
5156
JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0
5257
Java Portlet Specification V2.0 under Commons Development and Distribution License, Version 1.0
58+
Java Servlet API under CDDL + GPLv2 with classpath exception
59+
Java Transaction API under Commons Development and Distribution License, Version 1.0
5360
java-support under The Apache Software License, Version 2.0
5461
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
5562
JavaMail 1.4 under The Apache Software License, Version 2.0
5663
javax.annotation API under CDDL + GPLv2 with classpath exception
5764
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
5865
JAXB2 Basics - Runtime under BSD-Style License
59-
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
60-
Joda time under Apache 2
66+
JCL 1.2 implemented over SLF4J under Apache-2.0
67+
Joda-Time under Apache License, Version 2.0
6168
Joda-Time JSP tags support under Apache 2
6269
jstl under Commons Development and Distribution License, Version 1.0
63-
JUL to SLF4J bridge under MIT License
70+
JUL to SLF4J bridge under MIT
6471
JUnit under Eclipse Public License 1.0
65-
Log4j Implemented Over SLF4J under Apache Software Licenses
66-
Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
67-
Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
72+
Log4j Implemented Over SLF4J under Apache-2.0
73+
Logback Classic Module under Eclipse Public License - v 2.0 or GNU Lesser General Public License
74+
Logback Core Module under Eclipse Public License - v 2.0 or GNU Lesser General Public License
6875
mockito-core under The MIT License
6976
Objenesis under Apache License, Version 2.0
7077
Old JAXB Runtime under Eclipse Distribution License - v 1.0
@@ -89,23 +96,22 @@ This project includes:
8996
Resource Server Content under Apache License Version 2.0
9097
Resource Server Core under Apache License Version 2.0
9198
Resource Server Utilities under Apache License Version 2.0
92-
servlet-api under Commons Development and Distribution License, Version 1.0
93-
SLF4J API Module under MIT License
99+
SLF4J API Module under MIT
94100
Spring AOP under The Apache Software License, Version 2.0
95101
Spring Beans under The Apache Software License, Version 2.0
96102
Spring Context under The Apache Software License, Version 2.0
97103
Spring Context Support under The Apache Software License, Version 2.0
98104
Spring Core under The Apache Software License, Version 2.0
99105
Spring Expression Language (SpEL) under The Apache Software License, Version 2.0
100106
Spring JDBC under The Apache Software License, Version 2.0
101-
Spring Portlet WebMVC Contributions under Apache License Version 2.0
107+
Spring Object/XML Marshalling under The Apache Software License, Version 2.0
108+
Spring Portlet WebMVC Contributions under Apache License, Version 2.0
102109
Spring TestContext Framework under The Apache Software License, Version 2.0
103110
Spring Transaction under The Apache Software License, Version 2.0
104111
Spring Web under The Apache Software License, Version 2.0
105112
Spring Web MVC under The Apache Software License, Version 2.0
106113
Spring Web Portlet under The Apache Software License, Version 2.0
107114
Spring WS Core under The Apache Software License, Version 2.0
108-
spring-oxm under The Apache Software License, Version 2.0
109115
spring-security-core under The Apache Software License, Version 2.0
110116
spring-ws-security under Apache License, Version 2.0
111117
spring-xml under Apache License, Version 2.0
@@ -114,5 +120,6 @@ This project includes:
114120
Streaming API for XML under Sun Binary Code License
115121
Woodstox under The Apache Software License, Version 2.0
116122
WSDL4J under CPL
123+
XML Commons External Components XML APIs under The Apache Software License, Version 2.0
117124
XMLTooling-J under Apache 2
118125

0 commit comments

Comments
 (0)