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 ab42058 ISIS-2836: remove artifact isis-mavendeps-jdo
ab42058 is described below
commit ab4205831bf6409f5bc0d4758fad8f194dd6e371
Author: Andi Huber <[email protected]>
AuthorDate: Mon Aug 16 10:39:17 2021 +0200
ISIS-2836: remove artifact isis-mavendeps-jdo
---
core/pom.xml | 6 -----
examples/demo/wicket/jdo/pom.xml | 5 ++--
extensions/core/command-log/jdo/pom.xml | 5 ++--
mavendeps/jdo/pom.xml | 44 ---------------------------------
mavendeps/pom.xml | 6 -----
regressiontests/pom.xml | 5 ++--
subdomains/excel/fixture/pom.xml | 5 ++--
subdomains/excel/integtests/pom.xml | 5 ++--
8 files changed, 10 insertions(+), 71 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index c5a3e4b..4b91ff5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -856,12 +856,6 @@
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
<version>2.0.0-SNAPSHOT</version>
<type>pom</type>
diff --git a/examples/demo/wicket/jdo/pom.xml b/examples/demo/wicket/jdo/pom.xml
index 8ad333c..d82a8a0 100644
--- a/examples/demo/wicket/jdo/pom.xml
+++ b/examples/demo/wicket/jdo/pom.xml
@@ -46,9 +46,8 @@
<!-- PERSISTENCE -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/core/command-log/jdo/pom.xml
b/extensions/core/command-log/jdo/pom.xml
index 36d554c..430b875 100644
--- a/extensions/core/command-log/jdo/pom.xml
+++ b/extensions/core/command-log/jdo/pom.xml
@@ -54,9 +54,8 @@
<!-- PERSISTENCE -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
<!-- Testing -->
diff --git a/mavendeps/jdo/pom.xml b/mavendeps/jdo/pom.xml
deleted file mode 100644
index c97ef6d..0000000
--- a/mavendeps/jdo/pom.xml
+++ /dev/null
@@ -1,44 +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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mavendeps-jdo</artifactId>
-
- <packaging>pom</packaging>
-
- <name>Apache Isis Maven Deps - JDO</name>
- <description>
- Defines a module that provides the default JDO persistence layer
integration
- for running an Apache Isis webapp (Wicket, Restful Objects and Shiro
security).
- </description>
-
- <dependencies>
-
- <!-- PERSISTENCE -->
- <dependency>
- <groupId>org.apache.isis.persistence</groupId>
-
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index a17c12b..523887f 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -106,12 +106,6 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 6176de4..9e902a6 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -187,9 +187,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index a288446..ab40a18 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -106,9 +106,8 @@ under the License.
-->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
<!-- test -->
diff --git a/subdomains/excel/integtests/pom.xml
b/subdomains/excel/integtests/pom.xml
index 2d4a1f6..323c1cc 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -93,9 +93,8 @@ under the License.
<!-- PERSISTENCE -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
<scope>test</scope>
</dependency>
