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/07/30 05:49:39 UTC
[isis] branch master updated: ISIS-3097: remove aritfact 'isis-valuetypes-prism-vaadin'
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/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e137280bf2 ISIS-3097: remove aritfact 'isis-valuetypes-prism-vaadin'
e137280bf2 is described below
commit e137280bf27b31d1e46a990075d2b1cb1f5119a2
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Jul 30 07:49:33 2022 +0200
ISIS-3097: remove aritfact 'isis-valuetypes-prism-vaadin'
- instead moves the (single) utility class to vaadin-ui
---
.../modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc | 5 +++
incubator/viewers/vaadin/ui/pom.xml | 6 +++
.../viewer/vaadin/ui/util}/PrismResourcesVaa.java | 3 +-
valuetypes/asciidoc/ui/vaadin/pom.xml | 6 ---
.../ui/vaa/components/AsciiDocFieldVaa.java | 2 +-
valuetypes/prism/vaadin/pom.xml | 48 ----------------------
6 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
index 4ae6dcd2e5..837c3803d4 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
@@ -213,4 +213,9 @@ import org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-prism-wicket</artifactId>
-->
+
+<!-- removed
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-prism-vaadin</artifactId>
+-->
----
diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index fd0044d357..239b200141 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -121,6 +121,12 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtimeservices</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-prism-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>com.vaadin</groupId>
diff --git a/valuetypes/prism/vaadin/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/util/PrismResourcesVaa.java
similarity index 92%
rename from valuetypes/prism/vaadin/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java
rename to incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/util/PrismResourcesVaa.java
index cd3e5fa1d2..f67518eeac 100644
--- a/valuetypes/prism/vaadin/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/util/PrismResourcesVaa.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.prism.vaa;
+package org.apache.isis.incubator.viewer.vaadin.ui.util;
-import org.apache.isis.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
import org.apache.isis.valuetypes.prism.Prism;
import lombok.Getter;
diff --git a/valuetypes/asciidoc/ui/vaadin/pom.xml b/valuetypes/asciidoc/ui/vaadin/pom.xml
index aaa1d24956..fe94201b0c 100644
--- a/valuetypes/asciidoc/ui/vaadin/pom.xml
+++ b/valuetypes/asciidoc/ui/vaadin/pom.xml
@@ -36,12 +36,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-prism-vaadin</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
diff --git a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
index 5ef32a2c60..bfd875ca3b 100644
--- a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
+++ b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldVaa.java
@@ -25,8 +25,8 @@ import com.vaadin.flow.component.html.Div;
import org.springframework.lang.Nullable;
import org.apache.isis.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
+import org.apache.isis.incubator.viewer.vaadin.ui.util.PrismResourcesVaa;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-import org.apache.isis.valuetypes.prism.vaa.PrismResourcesVaa;
public class AsciiDocFieldVaa extends CustomField<AsciiDoc> {
diff --git a/valuetypes/prism/vaadin/pom.xml b/valuetypes/prism/vaadin/pom.xml
deleted file mode 100644
index df14aa2cc5..0000000000
--- a/valuetypes/prism/vaadin/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-prism</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-valuetypes-prism-vaadin</artifactId>
- <name>Apache Isis Val - Prism (Vaadin)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.prism.vaadin</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/prism/vaadin</git-plugin.propertiesDir>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-prism-resources</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.incubator.viewer</groupId>
- <artifactId>isis-viewer-vaadin-ui</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-
-</project>