Skip to content

Commit

Permalink
CAY-2822 Rename cayenne-server module to cayenne
Browse files Browse the repository at this point in the history
  • Loading branch information
stariy95 committed Nov 22, 2023
1 parent 1b05343 commit 5c408c3
Show file tree
Hide file tree
Showing 2,685 changed files with 59 additions and 56 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ CAY-2814 Select query iterator() and batchIterator() methods return incorrect re
CAY-2817 Pagination flow refactoring
CAY-2819 DataContext.performIteratedQuery() method should be unified with iterator() method
CAY-2821 Change development versioning schema
CAY-2822 Rename `cayenne-server` module to `cayenne`

Bug Fixes:

Expand Down
5 changes: 4 additions & 1 deletion UPGRADE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ as an example) :
.build();
Two things to note here: (1) a module-specific extender is created using an "extend(Binder)" method of the module, and
(2) an extender does not produce a Module, instead it adds services directly to the Binder. So it is usually invoked
within a lambda that produces a Module, or within an app <odule.
within a lambda that produces a Module, or within an app Module.

* Per CAY-2822 `cayenne-server` module is renamed to `cayenne`, so you need to change
that accordingly in your build scripts

UPGRADING TO 4.2.M2

Expand Down
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.cayenne:cayenne</include>
<include>org.apache.cayenne:cayenne-ant</include>
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
<include>org.apache.cayenne:cayenne-cgen</include>
Expand All @@ -79,13 +80,12 @@
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-velocity</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib/third-party</outputDirectory>
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<!-- Include only a minimal set of dependencies to run cayenne and ant tasks -->
<includes>
<include>org.slf4j:slf4j-api</include>
</includes>
Expand Down
4 changes: 2 additions & 2 deletions assembly/src/main/resources/assemblies/mac/assembly-mac.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<dependencySet>
<outputDirectory>${content.dir}/lib/</outputDirectory>
<includes>
<include>org.apache.cayenne:cayenne</include>
<include>org.apache.cayenne:cayenne-ant</include>
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
<include>org.apache.cayenne:cayenne-cgen</include>
Expand All @@ -77,13 +78,12 @@
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-velocity</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>${content.dir}/lib/third-party/</outputDirectory>
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<!-- Include only a minimal set of dependencies to run cayenne and ant tasks -->
<includes>
<include>org.slf4j:slf4j-api</include>
</includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.cayenne:cayenne</include>
<include>org.apache.cayenne:cayenne-ant</include>
<include>org.apache.cayenne:cayenne-cache-invalidation</include>
<include>org.apache.cayenne:cayenne-cgen</include>
Expand All @@ -77,13 +78,12 @@
<include>org.apache.cayenne:cayenne-osgi</include>
<include>org.apache.cayenne:cayenne-project</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-velocity</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib/third-party</outputDirectory>
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<!-- Include only a minimal set of dependencies to run cayenne and ant tasks -->
<includes>
<include>org.slf4j:slf4j-api</include>
</includes>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-cache-invalidation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion cayenne-cgen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-commitlog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-crypto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-dbsync/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-jcache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion cayenne-lifecycle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion cayenne-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion cayenne-project-compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions cayenne-velocity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<!-- Compile dependencies -->
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
Expand All @@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<artifactId>cayenne</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
8 changes: 4 additions & 4 deletions cayenne-server/pom.xml → cayenne/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<artifactId>cayenne-parent</artifactId>
<version>5.0-SNAPSHOT</version>
</parent>
<artifactId>cayenne-server</artifactId>
<name>cayenne-server: Cayenne Server</name>
<description>Cayenne Server</description>
<artifactId>cayenne</artifactId>
<name>cayenne: Cayenne Core</name>
<description>Apache Cayenne core module</description>
<packaging>jar</packaging>

<dependencies>
Expand Down Expand Up @@ -168,7 +168,7 @@
<!--
src/main/jjtree/org/apache/cayenne/exp/parser for now is generated
outside of Maven with JavaCC command line tools (maybe we should do the same for EJBQL) :
$ cd cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser
$ cd cayenne/src/main/jjtree/org/apache/cayenne/exp/parser
# Parser grammar out of tree grammar:
$ ~/javacc-5.0/bin/jjtree ExpressionParser.jjt
# Parser java code:
Expand Down

0 comments on commit 5c408c3

Please sign in to comment.