Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,44 @@
# Since 4GB not enought for build, we use 'sudo' environment with 7.5GB RAM
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Since 4GB not enough for build, we use 'sudo' environment with 7.5GB RAM
# Downside: It's starts a little bit slower
# 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:
- DB_PROFILE=hsql
- DB_PROFILE=h2
- DB_PROFILE=derby
- DB_PROFILE=mysql-docker
- DB_PROFILE=postgres-docker

jdk:
- oraclejdk8
- oraclejdk7

script:
- mvn verify -q -DcayenneTestConnection=$DB_PROFILE
- mvn verify -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR

# prevent Travis from uneeded "mvn install" run
# prevent Travis from unneeded "mvn install" run
install: /bin/true

cache:
Expand Down
24 changes: 0 additions & 24 deletions cayenne-server/src/test/resources/simplelogger.properties

This file was deleted.

12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -890,12 +890,18 @@
<name>cayenneJdbcDriver</name>
<value>${cayenneJdbcDriver}</value>
</property>
<org.slf4j.simpleLogger.defaultLogLevel>${cayenneLogLevel}</org.slf4j.simpleLogger.defaultLogLevel>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<org.slf4j.simpleLogger.defaultLogLevel>${cayenneLogLevel}</org.slf4j.simpleLogger.defaultLogLevel>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -1346,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&amp;characterEncoding=UTF-8&amp;generateSimpleParameterMetadata=true</cayenneJdbcUrl>
<cayenneJdbcDriver>com.mysql.jdbc.Driver</cayenneJdbcDriver>
</systemPropertyVariables>
</configuration>
Expand Down Expand Up @@ -1418,11 +1424,11 @@
</dependencies>
</profile>
<profile>
<id>postgresdocker</id>
<id>postgres-docker</id>
<activation>
<property>
<name>cayenneTestConnection</name>
<value>postgresdocker</value>
<value>postgres-docker</value>
</property>
</activation>
<dependencies>
Expand Down