Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dynamo-v40' into dynamo-v40
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/docs/asciidoc/reference.adoc
  • Loading branch information
Bas Rutten committed Oct 21, 2024
2 parents 54a913f + 5eabe3b commit 7d9ee1b
Show file tree
Hide file tree
Showing 26 changed files with 351 additions and 343 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ dynamo-vaadin/target
dynamo-frontend-export/frontend/
*.sh
dynamo-frontend/frontend/generated
dynamo-angular/src/main/dynamo/.angular
11 changes: 9 additions & 2 deletions dynamo-angular/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<packaging>jar</packaging>
<name>Angular</name>
<description>Dynamo Framework Angular project.</description>
<url>https://www.dynamoframework.org</url>
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<properties>
<stagingDirectory>../target/staging/maven</stagingDirectory>
Expand Down Expand Up @@ -75,7 +76,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -87,6 +87,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 8 additions & 8 deletions dynamo-angular/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M10</version>
</skin>
<version position="right"/>
<bannerLeft>
<name> </name>
<src>../images/logo-dynamo.png</src>
<href>https://dynamoframework.org</href>
</bannerLeft>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<topBarIcon>
<name>Dynamo Framework</name>
<alt>Dynamo Framework</alt>
<src>../images/logo-dynamo.png</src>
<href>../../index.html</href>
</topBarIcon>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
</project>
11 changes: 9 additions & 2 deletions dynamo-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<packaging>jar</packaging>
<name>API</name>
<description>Dynamo Framework API project.</description>
<url>https://www.dynamoframework.org</url>
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<properties>
<stagingDirectory>../target/staging/maven</stagingDirectory>
Expand Down Expand Up @@ -77,7 +78,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -89,6 +89,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 8 additions & 8 deletions dynamo-api/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
<menu ref="modules"/>
<menu ref="reports"/>
</body>
<version position="right"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M10</version>
</skin>
<bannerLeft>
<name> </name>
<src>../images/logo-dynamo.png</src>
<href>https://dynamoframework.org</href>
</bannerLeft>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<topBarIcon>
<name>Dynamo Framework</name>
<alt>Dynamo Framework</alt>
<src>../images/logo-dynamo.png</src>
<href>../../index.html</href>
</topBarIcon>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
</project>
13 changes: 9 additions & 4 deletions dynamo-export/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<packaging>jar</packaging>
<name>Export functionality</name>
<description>Dynamo Framework export project.</description>
<url>https://www.dynamoframework.org</url>
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand All @@ -34,17 +35,14 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -133,6 +131,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 8 additions & 8 deletions dynamo-export/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
<menu ref="modules"/>
<menu ref="reports"/>
</body>
<version position="right"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M10</version>
</skin>
<bannerLeft>
<name> </name>
<src>../images/logo-dynamo.png</src>
<href>https://dynamoframework.org</href>
</bannerLeft>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<topBarIcon>
<name>Dynamo Framework</name>
<alt>Dynamo Framework</alt>
<src>../images/logo-dynamo.png</src>
<href>../../index.html</href>
</topBarIcon>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
</project>
13 changes: 9 additions & 4 deletions dynamo-formfill/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<packaging>jar</packaging>
<name>Form Fill Functionality</name>
<description>Dynamo Framework form fill functionality project.</description>
<url>https://www.dynamoframework.org</url>
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand Down Expand Up @@ -55,7 +56,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -85,7 +85,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -157,7 +156,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -169,6 +167,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 8 additions & 8 deletions dynamo-formfill/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
<menu ref="modules"/>
<menu ref="reports"/>
</body>
<version position="right"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M10</version>
</skin>
<bannerLeft>
<name> </name>
<src>../images/logo-dynamo.png</src>
<href>https://dynamoframework.org</href>
</bannerLeft>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<topBarIcon>
<name>Dynamo Framework</name>
<alt>Dynamo Framework</alt>
<src>../images/logo-dynamo.png</src>
<href>../../index.html</href>
</topBarIcon>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
</project>
10 changes: 8 additions & 2 deletions dynamo-functional-domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<dependencies>
<!-- Other Dynamo modules -->
Expand Down Expand Up @@ -104,7 +104,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -116,6 +115,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 8 additions & 8 deletions dynamo-functional-domain/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
<menu ref="modules"/>
<menu ref="reports"/>
</body>
<version position="right"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M10</version>
</skin>
<bannerLeft>
<name> </name>
<src>../images/logo-dynamo.png</src>
<href>https://dynamoframework.org</href>
</bannerLeft>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<topBarIcon>
<name>Dynamo Framework</name>
<alt>Dynamo Framework</alt>
<src>../images/logo-dynamo.png</src>
<href>../../index.html</href>
</topBarIcon>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
</project>
12 changes: 9 additions & 3 deletions dynamo-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<packaging>jar</packaging>
<name>Implementation</name>
<description>Dynamo Framework implementation project.</description>
<url>https://www.dynamoframework.org</url>
<parent>
<groupId>org.dynamoframework</groupId>
<artifactId>dynamo-parent</artifactId>
<version>4.0.0-RC2-SNAPSHOT</version>
<version>4.0.0-RC3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand Down Expand Up @@ -87,7 +88,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -157,7 +157,6 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor.maven.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -169,6 +168,13 @@
<stagingDirectory>../target/staging/maven</stagingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>com.ragedunicorn.tools.maven</groupId>
<artifactId>github-release-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 7d9ee1b

Please sign in to comment.