You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/10/19 15:50:50 UTC
[causeway] 01/02: Merge remote-tracking branch 'origin/master' into spring6
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit f6e39a6ab14dd59696a7fc0b81933afa95055882
Merge: 497d59d745 993aecae39
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 19 17:49:51 2023 +0200
Merge remote-tracking branch 'origin/master' into spring6
.../ROOT/partials/module-nav/extensions.adoc | 1 +
antora/playbooks/site-extensions.yml | 2 +-
antora/playbooks/site.ALL.yml | 2 +-
antora/playbooks/site.NEXT.yml | 2 +-
antora/playbooks/site.yml | 2 +-
bom/pom.xml | 4 +-
.../core/config/CausewayConfiguration.java | 29 +++++++-----
.../docgen/adoc/modules/docgen/pages/about.adoc | 1 -
.../adoc/modules/executionoutbox/pages/about.adoc | 2 +-
.../modules/layoutgithub/partials/module-nav.adoc | 4 --
.../adoc/antora.yml | 0
.../adoc/modules/layoutloaders}/nav.adoc | 0
.../adoc/modules/layoutloaders}/pages/about.adoc | 53 +++++++++++++++++-----
.../modules/layoutloaders/partials/module-nav.adoc | 4 ++
.../loader => layoutloaders/github}/pom.xml | 10 ++--
.../CausewayModuleExtLayoutLoadersGithub.java} | 20 ++++----
.../github/menu/LayoutLoadersGitHubMenu.java} | 26 +++++------
.../layoutloaders/github/spiimpl}/GitHubItem.java | 2 +-
.../github/spiimpl}/GitHubResponse.java | 2 +-
.../spiimpl}/LayoutResourceLoaderFromGithub.java | 18 ++++----
...oaderFromGithub_tryLoadLayoutResource_Test.java | 14 +++---
.../layoutloaders/github/spiimpl}/.gitignore | 0
.../core/{layoutgithub => layoutloaders}/pom.xml | 8 ++--
extensions/pom.xml | 2 +-
...ausewayExtLayoutLoadersRoleAndPermissions.java} | 8 ++--
...ewayExtSecmanRegularUserRoleAndPermissions.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 4 +-
tooling/projectmodel/pom.xml | 2 +
28 files changed, 132 insertions(+), 94 deletions(-)
diff --cc bom/pom.xml
index 98194c6489,db14a73893..1617e493fb
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -930,18 -934,18 +930,18 @@@ It is therefore a copy of org.apache:ap
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (layoutloaders) -->
+ <!-- org.apache.causeway.extensions (layoutgithub) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub-loader</artifactId>
+ <artifactId>causeway-extensions-layoutloaders-github</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --cc extensions/core/layoutloaders/github/pom.xml
index 77e9c4b2cb,7c1820480d..683a12e243
--- a/extensions/core/layoutloaders/github/pom.xml
+++ b/extensions/core/layoutloaders/github/pom.xml
@@@ -22,8 -22,8 +22,8 @@@
<parent>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
diff --cc extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
index 4f36bdd084,bf7ca8fcea..ce1b21eb90
--- a/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
@@@ -16,10 -16,10 +16,10 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.causeway.extensions.layoutgithub.loader.menu;
+ package org.apache.causeway.extensions.layoutloaders.github.menu;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
@@@ -49,9 -49,9 +49,9 @@@ import lombok.val
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.TERTIARY
)
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
- public class LayoutLoaderMenu {
+ public class LayoutLoadersGitHubMenu {
public static abstract class ActionDomainEvent<T> extends CausewayModuleApplib.ActionDomainEvent<T> {}
diff --cc extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
index d08145631a,8f04f969ae..ae3f37f8f8
--- a/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
@@@ -39,8 -41,7 +39,8 @@@ import org.apache.causeway.commons.func
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResource;
import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResourceLoader;
- import org.apache.causeway.extensions.layoutgithub.loader.CausewayModuleExtLayoutGithubLoader;
- import org.apache.causeway.extensions.layoutgithub.loader.menu.LayoutLoaderMenu;
+ import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub;
++import org.apache.causeway.extensions.layoutloaders.github.menu.LayoutLoadersGitHubMenu;
import lombok.NonNull;
import lombok.val;
diff --cc extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
index 1df97550c1,f5aae48533..0a656db37a
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
@@@ -21,9 -21,9 +21,9 @@@ package org.apache.causeway.extensions.
import java.io.File;
import java.util.function.Supplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
- import org.apache.causeway.extensions.secman.applib.role.seed.CausewayExtLayoutGithubRoleAndPermissions;
+ import org.apache.causeway.extensions.secman.applib.role.seed.CausewayExtLayoutLoadersRoleAndPermissions;
import org.springframework.lang.Nullable;
diff --cc tooling/projectmodel/pom.xml
index fd1472a1f4,41149c0d89..1683c1e724
--- a/tooling/projectmodel/pom.xml
+++ b/tooling/projectmodel/pom.xml
@@@ -38,6 -38,6 +38,8 @@@
<properties>
<skipTests>true</skipTests>
<enforcer.skip>true</enforcer.skip>
++ <jar-plugin.automaticModuleName>org.apache.causeway.tooling.projectmodel</jar-plugin.automaticModuleName>
++ <git-plugin.propertiesDir>org/apache/causeway/tooling/projectmodel</git-plugin.propertiesDir>
</properties>
<dependencies>