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/06/19 07:06:14 UTC
[causeway] branch master updated: Bump datatables from 1.13.2 to 1.13.4
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new a4276a3d06 Bump datatables from 1.13.2 to 1.13.4
a4276a3d06 is described below
commit a4276a3d061dbd27c9dcd0cc7ef01894b00a1828
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jun 19 09:06:08 2023 +0200
Bump datatables from 1.13.2 to 1.13.4
---
bom/pom.xml | 2 +-
.../domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java | 9 +++------
.../demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java | 9 +++------
.../demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java | 9 +++------
.../wicket/ui/pages/common/datatables/DatatablesDotNet.java | 2 +-
5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 13848258e5..ce54e9d221 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -111,7 +111,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<datanucleus-jodatime.version>6.0.1</datanucleus-jodatime.version>
<datanucleus-rdbms.version>6.0.4</datanucleus-rdbms.version>
- <datatables.version>1.13.2</datatables.version> <!-- keep in sync with DatatablesDotNet -->
+ <datatables.version>1.13.4</datatables.version> <!-- keep in sync with DatatablesDotNet -->
<docx4j.version>11.3.2</docx4j.version>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
index c5abfe4a6e..44a26f6f81 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
@@ -31,19 +31,16 @@ import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.factory.FactoryService;
+import demoapp.dom.featured.customui.GeoapifyClient;
import demoapp.dom.featured.customui.WhereInTheWorldPage;
+import demoapp.dom.featured.customui.Zoom;
import demoapp.dom.featured.layout.tooltip.DemoItem;
-
+import demoapp.dom.featured.layout.tooltip.TooltipPage;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import demoapp.dom.featured.customui.GeoapifyClient;
-import demoapp.dom.featured.customui.Zoom;
-import demoapp.dom.featured.layout.tooltip.TooltipPage;
-
@Named("demo.FeaturedMenu")
@DomainService(
nature=NatureOfService.VIEW
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
index 17459969a9..dc7bafa3b8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
@@ -18,6 +18,8 @@
*/
package demoapp.dom.types.javaawt.images.jdo;
+import java.awt.image.BufferedImage;
+
import javax.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
@@ -28,19 +30,14 @@ import javax.jdo.annotations.PersistenceCapable;
import org.springframework.context.annotation.Profile;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.annotation.Title;
-
-import java.awt.image.BufferedImage;
+import demoapp.dom.types.javaawt.images.persistence.BufferedImageEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javaawt.images.persistence.BufferedImageEntity;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
index f236dadafb..6009280df7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
@@ -18,6 +18,8 @@
*/
package demoapp.dom.types.javaawt.images.jpa;
+import java.awt.image.BufferedImage;
+
import javax.inject.Named;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -29,21 +31,16 @@ import javax.persistence.Table;
import org.springframework.context.annotation.Profile;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-import java.awt.image.BufferedImage;
-
+import demoapp.dom.types.javaawt.images.persistence.BufferedImageEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javaawt.images.persistence.BufferedImageEntity;
-
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
index 00bf21c0ba..082c85ec38 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesDotNet.java
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
@RequiredArgsConstructor
enum DatatablesDotNet {
- VERSION("1.13.2");
+ VERSION("1.13.4");
@Getter @Accessors(fluent = true)
private final String literal;