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 2016/12/17 12:32:28 UTC
[1/5] cayenne git commit: Consistent names of profiles. Enable docker
builds on CI.
Repository: cayenne
Updated Branches:
refs/heads/master 3539f6633 -> cc5c5ae43
Consistent names of profiles.
Enable docker builds on CI.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4b5fcb29
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4b5fcb29
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4b5fcb29
Branch: refs/heads/master
Commit: 4b5fcb29428d08dd166ca3f66a0230783dce07d2
Parents: 3c3c95c
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Tue Dec 6 17:47:11 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Tue Dec 6 17:47:11 2016 +0300
----------------------------------------------------------------------
.travis.yml | 2 ++
pom.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4b5fcb29/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b749010..4908e88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ env:
- DB_PROFILE=hsql
- DB_PROFILE=h2
- DB_PROFILE=derby
+ - DB_PROFILE=mysql-docker
+ - DB_PROFILE=postgres-docker
jdk:
- oraclejdk8
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4b5fcb29/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1577a37..d73ba4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1428,7 +1428,7 @@
<activation>
<property>
<name>cayenneTestConnection</name>
- <value>postgresdocker</value>
+ <value>postgres-docker</value>
</property>
</activation>
<dependencies>
[5/5] cayenne git commit: Merge branch '152'
Posted by aa...@apache.org.
Merge branch '152'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cc5c5ae4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cc5c5ae4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cc5c5ae4
Branch: refs/heads/master
Commit: cc5c5ae438eebcce7efb0168986673924d856dc9
Parents: 3539f66 9e20c55
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sat Dec 17 15:31:47 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sat Dec 17 15:31:47 2016 +0300
----------------------------------------------------------------------
.travis.yml | 6 ++++++
pom.xml | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc5c5ae4/.travis.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cc5c5ae4/pom.xml
----------------------------------------------------------------------
[3/5] cayenne git commit: Consistent names of profiles.
Posted by aa...@apache.org.
Consistent names of profiles.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4d1d721c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4d1d721c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4d1d721c
Branch: refs/heads/master
Commit: 4d1d721c44bd7c68ec2da4bf1afef363e6a2af1a
Parents: d5fa542
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Tue Dec 6 17:53:22 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Tue Dec 6 17:53:22 2016 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4d1d721c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d73ba4f..a77c5f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1424,7 +1424,7 @@
</dependencies>
</profile>
<profile>
- <id>postgresdocker</id>
+ <id>postgres-docker</id>
<activation>
<property>
<name>cayenneTestConnection</name>
[2/5] cayenne git commit: Enable docker on travis.
Posted by aa...@apache.org.
Enable docker on travis.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d5fa5428
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d5fa5428
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d5fa5428
Branch: refs/heads/master
Commit: d5fa54288406c82d856900c4b86b830ce025ae7a
Parents: 4b5fcb2
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Tue Dec 6 17:49:12 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Tue Dec 6 17:49:12 2016 +0300
----------------------------------------------------------------------
.travis.yml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d5fa5428/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 4908e88..fcea25f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,10 @@
# How to fix: Change build setting or fix code.
# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
sudo: required
+
+services:
+ - docker
+
language: java
env:
[4/5] cayenne git commit: Connection properties for mysql in docker.
Posted by aa...@apache.org.
Connection properties for mysql in docker.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9e20c550
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9e20c550
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9e20c550
Branch: refs/heads/master
Commit: 9e20c550ca9873fd54af7068009fbaa9048b79b9
Parents: 4d1d721
Author: Ruslan Ibragimov <ru...@ibragimov.by>
Authored: Tue Dec 6 19:34:45 2016 +0300
Committer: Ruslan Ibragimov <ru...@ibragimov.by>
Committed: Tue Dec 6 19:34:45 2016 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9e20c550/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a77c5f9..ae73ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1352,7 +1352,7 @@
<cayenneAdapter>org.apache.cayenne.dba.mysql.MySQLAdapter</cayenneAdapter>
<cayenneJdbcUsername>root</cayenneJdbcUsername>
<cayenneJdbcPassword></cayenneJdbcPassword>
- <cayenneJdbcUrl>jdbc:mysql://${db.host}:${db.port}/cayenne</cayenneJdbcUrl>
+ <cayenneJdbcUrl>jdbc:mysql://${db.host}:${db.port}/cayenne?useUnicode=true&characterEncoding=UTF-8&generateSimpleParameterMetadata=true</cayenneJdbcUrl>
<cayenneJdbcDriver>com.mysql.jdbc.Driver</cayenneJdbcDriver>
</systemPropertyVariables>
</configuration>