You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/08 03:05:15 UTC
[isis] branch spring6 updated (bff66a253b -> 755e7c99bb)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from bff66a253b Merge remote-tracking branch 'origin/master' into spring6
add 18b06c3c5d ISIS-2297: adds simple CSV MM export option
add 69fe117783 ISIS-2297: disable export formats, that don't work yet
add 1dd8fb00f6 ISIS-3302: [Commons] Text Util to properly handle Files with BOM Signature
add 4ed4a347e1 ISIS-2297: tooling: test fixes
new 755e7c99bb Merge remote-tracking branch 'origin/master' into spring6
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.
Summary of changes:
.../services/metamodel/MetaModelServiceMenu.java | 121 +++++++++++----------
.../applib/services/metamodel/_CsvExport2.java | 115 ++++++++++++++++++++
.../causeway/commons/internal/base/_Text.java | 20 +++-
.../src/main/java/demoapp/dom/menubars.layout.xml | 3 +-
.../domainmodel/MetaModelRegressionTest.java | 6 +-
.../tooling/javamodel/test/AnalyzerTest.java | 18 +--
.../tooling/javamodel/test/ProjectSamples.java | 59 ++++------
7 files changed, 229 insertions(+), 113 deletions(-)
create mode 100644 api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/_CsvExport2.java
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
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/isis.git
commit 755e7c99bbc3c58b961d7bec2dca7d8cb6bc6e08
Merge: bff66a253b 4ed4a347e1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 8 04:05:01 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../services/metamodel/MetaModelServiceMenu.java | 121 +++++++++++----------
.../applib/services/metamodel/_CsvExport2.java | 115 ++++++++++++++++++++
.../causeway/commons/internal/base/_Text.java | 20 +++-
.../src/main/java/demoapp/dom/menubars.layout.xml | 3 +-
.../domainmodel/MetaModelRegressionTest.java | 6 +-
.../tooling/javamodel/test/AnalyzerTest.java | 18 +--
.../tooling/javamodel/test/ProjectSamples.java | 59 ++++------
7 files changed, 229 insertions(+), 113 deletions(-)
diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
index 1329a51213,3ec270f50e..689d481ab7
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
@@@ -42,17 -45,12 +42,14 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
- import org.apache.causeway.applib.value.NamedWithMimeType;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.causeway.commons.internal.collections._Sets;
- import org.apache.causeway.commons.internal.resources._Json;
import org.apache.causeway.commons.internal.resources._Xml;
import org.apache.causeway.commons.internal.resources._Xml.WriteOptions;
- import org.apache.causeway.commons.internal.resources._Yaml;
import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.val;
/**
diff --cc regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index cfb0d01703,9c697490e6..b134227494
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@@ -18,9 -18,10 +18,10 @@@
*/
package org.apache.causeway.testdomain.domainmodel;
+ import java.nio.charset.StandardCharsets;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.approvaltests.Approvals;
import org.approvaltests.core.Options;