This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new c46622c54 CAY-2947 Merge "cayenne-commitlog" into the core
c46622c54 is described below

commit c46622c54375fc501644c504c7910a3c6660c77b
Author: Andrus Adamchik <[email protected]>
AuthorDate: Fri May 22 18:19:42 2026 -0400

    CAY-2947 Merge "cayenne-commitlog" into the core
    
    assembly cleanup
---
 assembly/pom.xml                                                    | 6 ------
 assembly/src/main/resources/assemblies/generic/assembly-generic.xml | 1 -
 assembly/src/main/resources/assemblies/mac/assembly-mac.xml         | 1 -
 assembly/src/main/resources/assemblies/windows/assembly-windows.xml | 1 -
 cayenne-lifecycle/pom.xml                                           | 6 ------
 5 files changed, 15 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4f5a29e73..cb3f03d3c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -70,12 +70,6 @@
                        <version>${project.version}</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.apache.cayenne</groupId>
-                       <artifactId>cayenne-commitlog</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
                <dependency>
                        <groupId>org.apache.cayenne</groupId>
                        <artifactId>cayenne-crypto</artifactId>
diff --git 
a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml 
b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
index 96cc74674..f59f9daa7 100644
--- a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -71,7 +71,6 @@
                                
<include>org.apache.cayenne:cayenne-ant</include>
                                
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
                                
<include>org.apache.cayenne:cayenne-cgen</include>
-                               
<include>org.apache.cayenne:cayenne-commitlog</include>
                                
<include>org.apache.cayenne:cayenne-crypto</include>
                                
<include>org.apache.cayenne:cayenne-dbsync</include>
                                <include>org.apache.cayenne:cayenne-di</include>
diff --git a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml 
b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
index d21127b36..fd0be862a 100644
--- a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -69,7 +69,6 @@
                                
<include>org.apache.cayenne:cayenne-ant</include>
                                
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
                                
<include>org.apache.cayenne:cayenne-cgen</include>
-                               
<include>org.apache.cayenne:cayenne-commitlog</include>
                                
<include>org.apache.cayenne:cayenne-crypto</include>
                                
<include>org.apache.cayenne:cayenne-dbsync</include>
                                <include>org.apache.cayenne:cayenne-di</include>
diff --git 
a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml 
b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
index 432832d4d..055603993 100644
--- a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -69,7 +69,6 @@
                                
<include>org.apache.cayenne:cayenne-ant</include>
                                
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
                                
<include>org.apache.cayenne:cayenne-cgen</include>
-                               
<include>org.apache.cayenne:cayenne-commitlog</include>
                                
<include>org.apache.cayenne:cayenne-crypto</include>
                                
<include>org.apache.cayenne:cayenne-dbsync</include>
                                <include>org.apache.cayenne:cayenne-di</include>
diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml
index 63f498566..366205b30 100644
--- a/cayenne-lifecycle/pom.xml
+++ b/cayenne-lifecycle/pom.xml
@@ -27,12 +27,6 @@
                        <artifactId>cayenne</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.apache.cayenne</groupId>
-                       <artifactId>cayenne-commitlog</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
                <!-- Test dependencies -->
                <dependency>
                        <groupId>org.junit.jupiter</groupId>

Reply via email to