Skip to content

Commit

Permalink
Merge 506b4e9 into 679e279
Browse files Browse the repository at this point in the history
  • Loading branch information
HidekiSugimoto189 committed Aug 24, 2020
2 parents 679e279 + 506b4e9 commit c04266b
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 10 deletions.
Binary file added .travis.key.gpg.enc
Binary file not shown.
22 changes: 22 additions & 0 deletions .travis.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,32 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>ossrh</id>
<username>${env.OSSRH_USER}</username>
<password>${env.OSSRH_PASS}</password>
</server>
<server>
<id>ossrh-release</id>
<username>${env.OSSRH_USER}</username>
<password>${env.OSSRH_PASS}</password>
</server>
<server>
<id>ossrh-snapshot</id>
<username>${env.OSSRH_USER}</username>
<password>${env.OSSRH_PASS}</password>
</server>
</servers>
<profiles>
<profile>
<id>ossrh</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.executable>gpg</gpg.executable>
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
</properties>
</profile>
</profiles>
</settings>
15 changes: 13 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ before_install:
- export TZ=Asia/Tokyo
before_script:
- date
before_deploy:
- openssl aes-256-cbc -K $encrypted_c0fddd6d7622_key -iv $encrypted_c0fddd6d7622_iv -in .travis.key.gpg.enc -out .travis.key.gpg -d
- chmod 600 .travis.key.gpg
- gpg --import .travis.key.gpg
deploy:
provider: script
skip_cleanup: true
script: mvn -DperformRelease=true --settings .travis.settings.xml
on:
tags: true
after_success:
- mvn clean test jacoco:report coveralls:report
- "[[ ${TRAVIS_PULL_REQUEST} == 'false' ]] && [[ ${TRAVIS_TAG} == '' ]] && mvn deploy -DskipTests --settings .travis.settings.xml"
Expand All @@ -21,5 +31,6 @@ notifications:
on_failure: always
env:
global:
- secure: bQ+Hu6gXdWlyE12rDjycf17V872uFlJi56Ebg5MHKrRlJDCUr3aG1BKgr5DlClJzuPNsx0NtCyowrMm40hwQJL0G3FWc317amCIjpcLnf3Dw0Vz/YpVTHfZxmCvDTHcZYh0cKavauFFnYcZb1g0hGn4hMsg3paU/5YsH6o8EKQC4OR29aWyXImnpGmYCzf5/Xo235stmnv9ksH1SttjsfZQli1/SUlK+Lj/vPP7atjbsH3h8AjfrSp6BcZ4o8PpI331iyBNZQZeyNfsdKF4sUQypVkI5UkQiGQbjloE+LCY2oBjSOTT6/VjP4YV4LAveLpVAf1KxJAyA0/pQMhpOuvY2Bw2UdNueg/euEbUBSBnmjmtSNMVDCoFpuZk4WNqdhkmTvG0mpjVBxmXvhS+lpFrRs1gOr+hLhJVK0RVp77F4y7IOkwnK2mo2fJtXufK9ccQI3cQMLt0yxnYbRHqhlGc1padnPh1Oo/fvU0WieNoiAkz5CISNkppr2RhVuSGnSgVhaf618q6xA84sPN6BpoHbf69dxc7NNgb2izMSxJqPW2bjysZnuX7VNKXyBfAjURle4roqZ9yY3hu10OH1USOe58NXSUc45EWDCGYZEsSbbLdJYAIqbDbbnBzDnR9QF+kKbFHXkCx5VkCskBpnALMCUp51fNd/vskh5FUstBU=
- secure: NYp21lc1HBVp3PAdt1j2oIY2ecLAucYUYWezjQZw62uaTR+Nh8zhdwsj/M3edEscaTrttzvIlk3uKrgHlMYS4pJ8Vm1FDpIR/OCuFrIbtP1EgnBJDl+1J3tkuuaavfXFQetdiFRPO3TTxlcEKOhe1zoXlp7eCZB9o1O+XtmUrei5NNw8QdGlzDY+m9oZ+WnDXgOWAyW7I377qXB2POzmhszsQqys804ZH3M6ltWzge9CJiTVmDgk1Qj4rS8Guki/vQEb19UBdvbR8rCl9iCQ1xK/o3xFgLOaFi4cuQp8wKKcbysLCMDwKZE99BUJEoX/fNDB6qZ0dOv61vVnaeIdR7YnGWQjPbC0da23CSoM4pWqoPx0yTWQj5kr1HTixi2cE6XgUlaUJUh02CcpC0hzXQ8o8AGzUhzTYyQCWDohovznNWCtXLu372xDEo7uxrR7JjHZzg01UpiqA0BpZpaQDJSl+89D+srFibPGZsyM5iDCWL5B5rLKunb4N+HOUfGDlZOyJVxFc4PehxDoDo1/0KFd+31xfh36iZRucjUxpf3BvqONwZLbgQv4l2gpFxpfeApjBkqUn0yJGMVMkLfT8x0TblK7rz9A7jLJCDO8wH/l8Zdv6kNOB83kAd0vWBYL0/ftlmW64MCxPXfjmAj4l5k5Ind9zkxR8ZQo0B8YFOM=
- secure: VKnQHGR2DXqRQtO/r3S53AevlLrdXLPhBgRrq0/JlS6Nz3tc+mO6k/f6oMNp/quR+kush+aVgQJ0l1aOKvYkeURZxUeK3HkyVPLF69NB/90VtCqZPM4oHyNRSsXHa9u0ak0BA3ZIR0Cjq9vavtCh42IAkpCRtUjHNZ4d08T/n+TjtDJjrAdDU6XxAyIyfu5J41XtIa0DIxd6WFW67ieUrodkQRYADe0A3tTBAWwVYKdvqlqjrIWdQu5ZucWuDaA+pA14LstrmIa3ZYkUvdu/6Q7mdiuMlV6k2g9fxSbnAPzK36mLR7SvzJXbTDUHYe1ZXkOs+REQupHWUHbLHvJFk8CCZQnvzNvK3p2G945uWz1d5BWs9ral7Xj2Qkgz80V0Gws46eHUWwBNYfDGaTvBpUnEUMlAiM1Pl1kZ3IzZy8gTZsORqA0FAMh4yZ85AD7LBMlIfo5m7eWudexr1BUFEQzIPrXZnTLd4Po4ZQN/LUhOioVoJst2G6BsgyqGd485Gaa+ykUP478YqZVjxp5+fsqJQhaDmlXrjul6WMCXWaUb4q+66bgYKoyBfytOvAyIyXSdSKqOLxPMfAGJhdvXy82dvSbktI5YnCkgjRXNKGfs0KGX2ghdWX1IXqiQB98RZ0zFO8P/3Xagu9amXPavb2wQQPmWPF8/rbWO1x/p6FY=
- secure: fx6fY0ncs8Qw3xdNz9j8TqNfpXVZCsGutJ7k2RzTVaqFXqyqme3yQRm0l0OZb+TAkMdvvX3FFaqfMmSRTnVdolZiYyzjoY59fE1rGnuWLUfzxLWv3NAVCgnVn8D6JsC3aQ4ENNKjUmW7UNwBJWDTA7SQpLyPNh9HlK+lK5ABIdQ361JQmYyOq14arqo9QJ+MXuPczF9U/X1OgJzP5ChtqY+yu5bRPXCz5yD32vysUXwk8zZwYLFVJJTPTVvXzVlGDd8Wlrr1mIaCdTSq7+1/9V+tLIpNTmMOJUaZBjdY2pnfyl/MdZNVDlb3dlyY6s6M8dY2u9GF6nqf6iHGDLYN5x5i9A0C7Pjr8abMe7FIhCquF2GyhTKtjvhLnymybE/AWsulYU0Vgt1IwcAn/CtOOBhK88qWzC6Ud0Be0UM+AaZ/FY/oOA9Pus/duaqiufB1AqhDQLoUFc18OtOfezlHbxzCKAetdgXd0mzBmzZ7Rdx3d0s8FuKKg5Vhd6jDtA6tSfXszaJGURmIdZ8DwoiZynuJwjf2uvLDayjT38k6hPJ9hTdiXXoMaZ4oSf7UKsxQH2rR/rFaa/8Ww6tCZyzbCo/pk9/2PBxRYeXQisrvtIbdmLeDvZIxfJlHHjwoZzNHIVO4UxZa6foqL2B6kV3MhSKfF9kAvmN7pggzw2k+Hs4=
- secure: UzwvnIpff7pIbk7jzF9rMqLZaVs4QddzyocnuF2/Fyhp0PbPhqTf8al41mzWN+40Y+l1xX1indEnRoP2B28+oDAOV3+Qr8PCOwPC+4pxRo4oC1WW5VPhSFVhlROES/Ui5sOJK9gbpLPR6b1l3Aj91LX1ay8tI+a8wiWuzHpyyx69afnyFiMidYDPqw7OCW1bowvAnGOOI7Jm96NPLytEW3AqDt7Ea+eekkqSeZb1LBz2hxNeeRsMfdT4A3qf5uoJmWqK07GhA3aTOGS9ZYAIU/PUPHYeCPwjbpMfqso9DFeh1GqTzA2/HmSs2e0jzMPXneiPN3i8WkkuvF/FIVcyb7C16gXM6DmsuInLOyD+QpNQJ/I92TCYa84cf3ls373HwxIWPk3uVnItDLU3tv4Y/G3LlWyzJUtXQK4UwAzHdWoUXg5dQmYJ79PY7wT6xXmH3lUZWU86CKcFhb2NYIf9gieSI9fuTihB0CSJPJ+u4onglumVn99QZ1H5HHuMQQ4KuuZAmqn08jXECKSbRJujWaMe9wVXkBVbMUlEXRJVv8gUFgyhoLbA+Y1h4IAFzvUR5uaLU+pwc9iIMmFooPOmc6s33F+IOQ+cQNC9RYzwXNGBbpxjJVp8+5R1OOaaDJCHygsUNTlYfG+2s3GWQbMrOvhC47mT0Uw3kQzQvJk+N5E=
8 changes: 4 additions & 4 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Installation
<dependency>
<groupId>jp.co.future</groupId>
<artifactId>uroborosql</artifactId>
<version>0.19.0</version>
<version>0.20.0</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
Expand All @@ -39,7 +39,7 @@ Installation
<dependency>
<groupId>jp.co.future</groupId>
<artifactId>uroborosql</artifactId>
<version>0.19.0</version>
<version>0.20.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -52,14 +52,14 @@ Installation
#### for Gradle

```gradle
compile group: 'jp.co.future', name: 'uroborosql', version: '0.19.0'
compile group: 'jp.co.future', name: 'uroborosql', version: '0.20.0'
compile group: 'ognl', name: 'ognl', version: '3.1.23'
```

または

```gradle
compile group: 'jp.co.future', name: 'uroborosql', version: '0.19.0'
compile group: 'jp.co.future', name: 'uroborosql', version: '0.20.0'
compile group: 'org.springframework', name: 'spring-expression', version: '5.2.2.RELEASE'
```

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Installation
<dependency>
<groupId>jp.co.future</groupId>
<artifactId>uroborosql</artifactId>
<version>0.19.0</version>
<version>0.20.0</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
Expand All @@ -41,7 +41,7 @@ or
<dependency>
<groupId>jp.co.future</groupId>
<artifactId>uroborosql</artifactId>
<version>0.19.0</version>
<version>0.20.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -53,14 +53,14 @@ or
#### for Gradle

```gradle
compile group: 'jp.co.future', name: 'uroborosql', version: '0.19.0'
compile group: 'jp.co.future', name: 'uroborosql', version: '0.20.0'
compile group: 'ognl', name: 'ognl', version: '3.1.23'
```

or

```gradle
compile group: 'jp.co.future', name: 'uroborosql', version: '0.19.0'
compile group: 'jp.co.future', name: 'uroborosql', version: '0.20.0'
compile group: 'org.springframework', name: 'spring-expression', version: '5.2.2.RELEASE'
```

Expand Down

0 comments on commit c04266b

Please sign in to comment.