You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/08/02 05:48:04 UTC
[isis] branch ISIS-2965 created (now 368d66dc00)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2965
in repository https://gitbox.apache.org/repos/asf/isis.git
at 368d66dc00 ISIS-2965: fixes duplicate module reference for modules-example-demo-wicket
This branch includes the following new commits:
new 368d66dc00 ISIS-2965: fixes duplicate module reference for modules-example-demo-wicket
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 01/01: ISIS-2965: fixes duplicate module reference for modules-example-demo-wicket
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2965
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 368d66dc009a3a3e2266600744529805b0ff1a90
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Aug 2 06:47:42 2022 +0100
ISIS-2965: fixes duplicate module reference for modules-example-demo-wicket
---
examples/demo/pom.xml | 27 +++++++++++++++++++++------
pom.xml | 46 +++++++++++++++++++---------------------------
2 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 8eb7cdd4bc..7f4daf0bfa 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -188,21 +188,33 @@
<modules>
<module>domain</module>
- <module>web</module>
- <module>wicket/common</module>
- <module>wicket/jdo</module>
- <module>wicket/jpa</module>
</modules>
<profiles>
<profile>
- <id>demo-jpa-and-graphql</id>
+ <id>module-examples-demo-wicket</id>
<activation>
<property>
- <name>demo-jpa-and-graphql</name>
+ <name>module-examples-demo-wicket</name>
</property>
</activation>
<modules>
+ <module>web</module>
+ <module>wicket/common</module>
+ <module>wicket/jdo</module>
+ <module>wicket/jpa</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>module-examples-demo-graphql</id>
+ <activation>
+ <property>
+ <name>module-examples-demo-graphql</name>
+ </property>
+ </activation>
+ <modules>
+ <module>web</module>
+ <module>wicket/common</module>
<module>wicket/jpa-and-graphql</module>
</modules>
</profile>
@@ -214,6 +226,9 @@
</property>
</activation>
<modules>
+ <module>web</module>
+ <module>wicket/common</module>
+ <module>wicket/jdo</module>
<module>vaadin</module>
</modules>
</profile>
diff --git a/pom.xml b/pom.xml
index 3130f72a39..46928e5a87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,41 +200,28 @@
</profile>
<profile>
- <id>module-examples-demo-javafx</id>
+ <id>module-examples-demo-wicket</id>
<activation>
<property>
- <name>module-examples-demo-javafx</name>
+ <name>module-examples-demo-wicket</name>
</property>
</activation>
<modules>
- <!-- prerequisites ... -->
- <module>examples/demo/domain</module>
- <module>incubator/viewers/javafx</module>
-
- <module>examples/demo/javafx</module>
+ <module>examples/demo</module>
</modules>
</profile>
-
<profile>
- <id>module-examples-demo-wicket</id>
+ <id>module-examples-demo-graphql</id>
<activation>
<property>
- <name>module-examples-demo-wicket</name>
+ <name>module-examples-demo-graphql</name>
</property>
</activation>
<modules>
- <!-- prerequisites ... -->
+ <module>incubator/viewers/graphql</module>
<module>examples/demo</module>
- <module>examples/demo/domain</module>
- <module>examples/demo/web</module>
-
- <module>examples/demo/wicket/common</module>
- <module>examples/demo/wicket/jdo</module>
- <module>examples/demo/wicket/jpa</module>
</modules>
</profile>
-
-
<profile>
<id>module-examples-demo-vaadin</id>
<activation>
@@ -243,15 +230,20 @@
</property>
</activation>
<modules>
- <!-- prerequisites ... -->
- <module>examples/demo/domain</module>
<module>incubator/viewers/vaadin</module>
- <module>examples/demo/domain</module>
- <module>examples/demo/web</module>
- <module>examples/demo/wicket/common</module>
- <module>examples/demo/wicket/jdo</module>
-
- <module>examples/demo/vaadin</module>
+ <module>examples/demo</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>module-examples-demo-javafx</id>
+ <activation>
+ <property>
+ <name>module-examples-demo-javafx</name>
+ </property>
+ </activation>
+ <modules>
+ <module>incubator/viewers/javafx</module>
+ <module>examples/demo</module>
</modules>
</profile>