This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit f3b5ccc3ef8a14a397a7c370847775c4beb7d71a
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Jun 30 18:01:57 2022 +0300
CAY-2737 Cayenne 4.3: cleanup deprecated code
- delete dbcp2 and joda modules
---
assembly/pom.xml | 12 ------------
.../main/resources/assemblies/generic/assembly-generic.xml | 2 --
assembly/src/main/resources/assemblies/mac/assembly-mac.xml | 2 --
.../main/resources/assemblies/windows/assembly-windows.xml | 2 --
4 files changed, 18 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bb4ea821e..f06b895a6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -88,18 +88,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-joda</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-dbcp2</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-jcache</artifactId>
diff --git
a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
index 998f1d07a..a041e8fc6 100644
--- a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -76,11 +76,9 @@
<include>org.apache.cayenne:cayenne-client-jetty</include>
<include>org.apache.cayenne:cayenne-commitlog</include>
<include>org.apache.cayenne:cayenne-crypto</include>
-
<include>org.apache.cayenne:cayenne-dbcp2</include>
<include>org.apache.cayenne:cayenne-dbsync</include>
<include>org.apache.cayenne:cayenne-di</include>
<include>org.apache.cayenne:cayenne-jcache</include>
-
<include>org.apache.cayenne:cayenne-joda</include>
<include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
diff --git a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
index 5b32cdfb0..55d3de1fd 100644
--- a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -74,11 +74,9 @@
<include>org.apache.cayenne:cayenne-client-jetty</include>
<include>org.apache.cayenne:cayenne-commitlog</include>
<include>org.apache.cayenne:cayenne-crypto</include>
-
<include>org.apache.cayenne:cayenne-dbcp2</include>
<include>org.apache.cayenne:cayenne-dbsync</include>
<include>org.apache.cayenne:cayenne-di</include>
<include>org.apache.cayenne:cayenne-jcache</include>
-
<include>org.apache.cayenne:cayenne-joda</include>
<include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
diff --git
a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
index 7ab8a0ad2..47cee20c6 100644
--- a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -74,11 +74,9 @@
<include>org.apache.cayenne:cayenne-client-jetty</include>
<include>org.apache.cayenne:cayenne-commitlog</include>
<include>org.apache.cayenne:cayenne-crypto</include>
-
<include>org.apache.cayenne:cayenne-dbcp2</include>
<include>org.apache.cayenne:cayenne-dbsync</include>
<include>org.apache.cayenne:cayenne-di</include>
<include>org.apache.cayenne:cayenne-jcache</include>
-
<include>org.apache.cayenne:cayenne-joda</include>
<include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
