You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/30 16:43:48 UTC
[1/2] cayenne git commit: adding crypto module to assemblies
Repository: cayenne
Updated Branches:
refs/heads/master 32e5d9f90 -> 809482067
adding crypto module to assemblies
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/29d3dec5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/29d3dec5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/29d3dec5
Branch: refs/heads/master
Commit: 29d3dec5b39ad0a4d8861160d46ceec3d2a35027
Parents: 32e5d9f
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 30 18:38:14 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 30 18:39:00 2014 +0300
----------------------------------------------------------------------
assembly/pom.xml | 6 ++++++
assembly/src/main/resources/assemblies/assembly-generic.xml | 6 +++---
assembly/src/main/resources/assemblies/assembly-mac.xml | 6 +++---
assembly/src/main/resources/assemblies/assembly-windows.xml | 6 +++---
4 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29d3dec5/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 56523f3..5d64490 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -54,6 +54,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-crypto</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29d3dec5/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 3134ac2..8f578d3 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -73,12 +73,12 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
<include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-core</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29d3dec5/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 7f0f6c4..e97adc7 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -73,12 +73,12 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
<include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-core</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/29d3dec5/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 b049f9b..f56ad32 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -73,12 +73,12 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-client</include>
+ <include>org.apache.cayenne:cayenne-crypto</include>
<include>org.apache.cayenne:cayenne-di</include>
- <include>org.apache.cayenne:cayenne-core</include>
+ <include>org.apache.cayenne:cayenne-lifecycle</include>
<include>org.apache.cayenne:cayenne-server</include>
- <include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
- <include>org.apache.cayenne:cayenne-lifecycle</include>
</includes>
</dependencySet>
<dependencySet>
[2/2] cayenne git commit: 3.1 is stable
Posted by aa...@apache.org.
3.1 is stable
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/80948206
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/80948206
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/80948206
Branch: refs/heads/master
Commit: 80948206778de641421fefd91f04bf6c5274fc8e
Parents: 29d3dec
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 30 18:43:39 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 30 18:43:39 2014 +0300
----------------------------------------------------------------------
docs/docbook/cayenne-guide/src/docbkx/setup.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/80948206/docs/docbook/cayenne-guide/src/docbkx/setup.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/setup.xml b/docs/docbook/cayenne-guide/src/docbkx/setup.xml
index 5a0ccdc..7228d88 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/setup.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/setup.xml
@@ -45,12 +45,12 @@
<tr>
<td>3.1</td>
<td>Java 1.5 or newer</td>
- <td>Beta</td>
+ <td>Stable</td>
</tr>
<tr>
<td>3.0</td>
<td>Java 1.5</td>
- <td>Stable</td>
+ <td>Aging</td>
</tr>
<tr>
<td>1.2 / 2.0</td>