This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3253 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit d9074b770238d12dc6f1b4227486f62d507074a5 Author: danhaywood <[email protected]> AuthorDate: Mon Mar 13 17:11:45 2023 +0000 CAUSEWAY-3253: updates license headers and supplemental -license --- .../services/user/RoleMemento_value_Test.java | 18 ++++++++++++++++ .../services/user/UserMemento_contains_Test.java | 18 ++++++++++++++++ .../services/user/UserMemento_value_Test.java | 18 ++++++++++++++++ bom/pom.xml | 17 +++++++-------- .../commandsubscriber-vs-executionsubscriber.adoc | 2 ++ .../applib/job/RunBackgroundCommandsJob.java | 18 ++++++++++++++++ .../pdfjs/metamodel/domains/mixin/MixinDomain.java | 20 ++++++++++++++++-- .../metamodel/domains/mixin/SomeViewModel.java | 18 ++++++++++++++++ .../metamodel/domains/mixin/SomeViewModel_pdf.java | 18 ++++++++++++++++ .../pdfjs/metamodel/domains/prop/PropDomain.java | 18 ++++++++++++++++ .../metamodel/domains/prop/SomeViewModel.java | 18 ++++++++++++++++ .../src/main/resources/supplemental-models.xml | 24 +++++++++++++++++----- .../integtestsupport/applib/ApprovalsOptions.java | 18 ++++++++++++++++ 13 files changed, 210 insertions(+), 15 deletions(-) diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java index caaa7c1ecf..8583cf9e3c 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.applib.services.user; import java.util.Arrays; diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java index 932c5042c3..6689ba07c6 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.applib.services.user; import org.apache.causeway.applib.services.sudo.SudoService; diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java index a1d87b8d6c..86b247fa06 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.applib.services.user; import lombok.SneakyThrows; diff --git a/bom/pom.xml b/bom/pom.xml index 1bbfc3961e..1e388d6125 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -2474,6 +2474,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif <exclude>**/.settings/**</exclude> <exclude>**/*.launch</exclude> <exclude>**/*.columnOrder.txt</exclude> + <exclude>**/*.approved.xml</exclude> <exclude>**/*.drawio.svg</exclude> <exclude>**/META-INF/spring.factories</exclude> @@ -2508,11 +2509,10 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif <exclude>**/xml/objects/**</exclude> <exclude>**/test.data</exclude> <exclude>**/fixture-data/**</exclude> - <exclude>**/partials/module-nav.adoc</exclude> + <exclude>**/module-nav.adoc</exclude> <exclude>**/partials/extensions.adoc</exclude> - <exclude>**/partials/component-nav.adoc</exclude> + <exclude>**/component-nav.adoc</exclude> <exclude>**/_nav.adoc</exclude> - <exclude>**/_overview/nav.adoc</exclude> <exclude>**/application.js</exclude> @@ -2522,6 +2522,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif <exclude>**/moment.js</exclude> <exclude>**/prism*.js</exclude> <exclude>**/prism*.css</exclude> + <exclude>**/vega*.js</exclude> <exclude>**/kroviz/webpack.config.d/**</exclude> <exclude>**/viewer/wicket/ui/components/**/*.css</exclude> @@ -3055,18 +3056,18 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif <showWarnings>true</showWarnings> <parameters>true</parameters> <annotationProcessorPaths> - <!-- this is a workaround - + <!-- this is a workaround + Details: The maven compiler plugin ought to pick up all available processors on the classpath. - In effect Lombok's annotation processor should be picked up implicitly, but yet is not - + In effect Lombok's annotation processor should be picked up implicitly, but yet is not + Presence of file 'logging-dn-enhance.properties' decativates this profile and the maven-compiler-plugin runs all annotation processors as picked up from the class-path. --> <annotationProcessorPath> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>${lombok.version}</version> + <version>${lombok.version}</version> </annotationProcessorPath> </annotationProcessorPaths> </configuration> diff --git a/extensions/core/commandlog/adoc/modules/commandlog/partials/commandsubscriber-vs-executionsubscriber.adoc b/extensions/core/commandlog/adoc/modules/commandlog/partials/commandsubscriber-vs-executionsubscriber.adoc index 3c976b2079..41efd3bdae 100644 --- a/extensions/core/commandlog/adoc/modules/commandlog/partials/commandsubscriber-vs-executionsubscriber.adoc +++ b/extensions/core/commandlog/adoc/modules/commandlog/partials/commandsubscriber-vs-executionsubscriber.adoc @@ -1,3 +1,5 @@ +:Notice: 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 ag [...] + Conceptually a *command* represents the _intention_ to execute an action or to edit a property ("before" the change), while an *interaction execution* represents the actual execution itself ("after" the change). The xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[] SPI and xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[] SPI allow either to be subscribed to. diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java index 88fa3e1f14..7d43f342a9 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.extensions.commandlog.applib.job; import java.util.UUID; diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/MixinDomain.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/MixinDomain.java index 9b2393dfe5..6d3a8771f0 100644 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/MixinDomain.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/MixinDomain.java @@ -1,7 +1,23 @@ +/* + * 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.causeway.extensions.pdfjs.metamodel.domains.mixin; -import org.apache.causeway.applib.annotation.DomainObject; -import org.apache.causeway.applib.annotation.Nature; import org.springframework.context.annotation.Configuration; @Configuration diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel.java index 1872dcba26..9d624b54e7 100644 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.extensions.pdfjs.metamodel.domains.mixin; import org.apache.causeway.applib.annotation.DomainObject; diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java index 1b032861cf..1794daa4d4 100644 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/mixin/SomeViewModel_pdf.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.extensions.pdfjs.metamodel.domains.mixin; import lombok.RequiredArgsConstructor; diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/PropDomain.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/PropDomain.java index 9cc82435cc..2f2b7483d4 100644 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/PropDomain.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/PropDomain.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.extensions.pdfjs.metamodel.domains.prop; import org.springframework.context.annotation.Configuration; diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/SomeViewModel.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/SomeViewModel.java index cd5c63e682..bdda46c59e 100644 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/SomeViewModel.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/domains/prop/SomeViewModel.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.extensions.pdfjs.metamodel.domains.prop; import org.apache.causeway.applib.annotation.DomainObject; diff --git a/supplemental-model/src/main/resources/supplemental-models.xml b/supplemental-model/src/main/resources/supplemental-models.xml index f5ee43fe79..b3e9625d10 100644 --- a/supplemental-model/src/main/resources/supplemental-models.xml +++ b/supplemental-model/src/main/resources/supplemental-models.xml @@ -76,7 +76,7 @@ <project> <groupId>org.webjars.bowergithub.prismjs</groupId> <artifactId>prism</artifactId> - <version>1.28.0</version> + <version>1.29.0</version> <name>Prism</name> <licenses> <license> @@ -90,17 +90,31 @@ <supplement> <project> <groupId>org.webjars.npm</groupId> - <artifactId>dommatrix</artifactId> - <version>1.0.3</version> - <name>DOMMatrix</name> + <artifactId>inputmask</artifactId> + <version>5.0.6</version> + <name>Inputmask</name> <licenses> <license> <name>MIT License</name> - <url>https://spdx.org/licenses/MIT</url> + <url>https://github.com/RobinHerbots/Inputmask/blob/5.x/LICENSE.txt</url> </license> </licenses> </project> </supplement> + <supplement> + <project> + <groupId>org.webjars.npm</groupId> + <artifactId>path2d-polyfill</artifactId> + <version>2.0.1</version> + <name>path2d-polyfill</name> + <licenses> + <license> + <name>MIT License</name> + <url>https://github.com/nilzona/path2d-polyfill/blob/main/LICENSE</url> + </license> + </licenses> + </project> + </supplement> </supplementalDataModels> diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java index 55ae33effa..61da64c6ab 100644 --- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java +++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ApprovalsOptions.java @@ -1,3 +1,21 @@ +/* + * 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.causeway.testing.integtestsupport.applib; import lombok.SneakyThrows;
