You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/12/07 09:00:39 UTC
[24/24] cayenne git commit: CAY-2372 Extract new modules from
cayenne-server - add to assembly - upgrade notes
CAY-2372 Extract new modules from cayenne-server
- add to assembly
- upgrade notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/59d93045
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/59d93045
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/59d93045
Branch: refs/heads/master
Commit: 59d93045f023a77a1a4363c26885475009a1a7b6
Parents: db8eb3d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Dec 7 11:57:51 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Dec 7 11:57:51 2017 +0300
----------------------------------------------------------------------
assembly/pom.xml | 18 ++++++++++++++++++
.../resources/assemblies/assembly-generic.xml | 3 +++
.../main/resources/assemblies/assembly-mac.xml | 3 +++
.../resources/assemblies/assembly-windows.xml | 3 +++
docs/doc/src/main/resources/UPGRADE.txt | 13 ++++++++-----
pom.xml | 6 +++---
6 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1f5efd0..1f12538 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -156,6 +156,24 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-rop-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
index d2dc379..b38c3d8 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -98,6 +98,9 @@
<include>org.apache.cayenne:cayenne-xmpp</include>
<include>org.apache.cayenne:cayenne-velocity</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index 0ebb3ee..3811ec0 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -96,6 +96,9 @@
<include>org.apache.cayenne:cayenne-xmpp</include>
<include>org.apache.cayenne:cayenne-velocity</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index 09f7a05..1c0f5d9 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -96,6 +96,9 @@
<include>org.apache.cayenne:cayenne-xmpp</include>
<include>org.apache.cayenne:cayenne-velocity</include>
<include>org.apache.cayenne:cayenne-project-compatibility</include>
+ <include>org.apache.cayenne:cayenne-web</include>
+ <include>org.apache.cayenne:cayenne-osgi</include>
+ <include>org.apache.cayenne:cayenne-rop-server</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 7ed098c..07fc3ec 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -4,12 +4,15 @@ Apache Cayenne Upgrade Information
IMPORTANT: be sure to read all notes for the intermediate releases between your
current release and the release you are upgrading to.
-------------------------------------------------------------------------------
-UPGRADING TO 4.1.M1
+UPGRADING TO 4.1.M2
+
+* Per CAY-2372 three new modules extracted from Cayenne core. No changes to the packages or api have been made,
+ so you should only include additional module to your project (if it where used).
-* Per CAY-2372
- - Extract cayenne-web module from cayenne server. Now cayenne-web is autoloaded.
- - Extract cayenne-osgi module from cayenne-server.
- - Extract cayenne-rop-server from cayenne-server.
+ - cayenne-web module contains all logic related to bootstrapping Cayenne inside servlet container.
+ WebModule is autoloaded, so you shouldn't add it to runtime explicitly anymore.
+ - cayenne-osgi module contains OSGi related functionality.
+ - cayenne-rop-server ROP server part.
UPGRADING TO 4.1.M1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/59d93045/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b13feb8..73193f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,9 @@
<module>cayenne-protostuff</module>
<module>cayenne-server</module>
<module>cayenne-velocity</module>
+ <module>cayenne-web</module>
+ <module>cayenne-osgi</module>
+ <module>cayenne-rop-server</module>
<module>eventbridges</module>
<module>itests</module>
<module>maven-plugins</module>
@@ -79,9 +82,6 @@
<module>tutorials</module>
<module>docs</module>
<module>assembly</module>
- <module>cayenne-web</module>
- <module>cayenne-osgi</module>
- <module>cayenne-rop-server</module>
</modules>
<issueManagement>
<system>jira</system>