Skip to content

Commit 311cf17

Browse files
author
Jeff Butler
committed
Changes for move to the mybatis organization
1 parent f07b868 commit 311cf17

File tree

6 files changed

+75
-10
lines changed

6 files changed

+75
-10
lines changed

‎.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,10 @@ jdk:
88
- oraclejdk8
99

1010
after_success:
11-
- mvn clean test jacoco:report coveralls:report
11+
- chmod -R 777 ../travis/after_success.sh
12+
- ../travis/after_success.sh
13+
14+
env:
15+
global:
16+
- secure: "Py3H6JFD9LeXN8mGcc3tIkxSQTKV6mLOXuYXSKNXXyOrCYpgtIjgquVKhV+K\nQnIDneZw45kDsB63Em1QUiGmKchGuO4QmHTnwYKxL3gpiGCurMcLR4dxs+cx\nitmTTo7UnmRbERV0YxMS26Dlcm1zn4DVGdJlWPU/qIJhAmnusPQ="
17+
- secure: "N03lqVWTF1Nuhny9tGM/jlf188eZvN3F/7zjLnRW+b07QQ+zTty/T0QZu4tj\niOvmOCgwWBDjh+kv9MNadwZzPIWqWHrQpGe9ef6XZskwj/9gvtMz4s0Ur0Fi\nI2fSaWhfg6jhbM8OiUCalHsJDenEjLU8WtSIUal6c6zD/h+liyY="

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MyBatis Dynamic SQL
22

3-
[![Build Status](https://travis-ci.org/jeffgbutler/mybatis-dynamic-sql.svg?branch=master)](https://travis-ci.org/jeffgbutler/mybatis-dynamic-sql)
4-
[![Coverage Status](https://coveralls.io/repos/github/jeffgbutler/mybatis-dynamic-sql/badge.svg?branch=master)](https://coveralls.io/github/jeffgbutler/mybatis-dynamic-sql?branch=master)
3+
[![Build Status](https://travis-ci.org/mybatis/mybatis-dynamic-sql.svg?branch=master)](https://travis-ci.org/mybatis/mybatis-dynamic-sql)
4+
[![Coverage Status](https://coveralls.io/repos/github/mybatis/mybatis-dynamic-sql/badge.svg?branch=master)](https://coveralls.io/github/mybatis/mybatis-dynamic-sql?branch=master)
55

66
## What Is This?
77
This library is a framework for generating dynamic SQL statements. Think of it as a typesafe SQL templating library,

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,24 +165,24 @@
165165
</dependencies>
166166

167167
<scm>
168-
<url>https://github.com/jeffgbutler/mybatis-dynamic-sql</url>
169-
<connection>scm:git:ssh://github.com:jeffgbutler/mybatis-dynamic-sql.git</connection>
170-
<developerConnection>scm:git:ssh://[email protected]:jeffgbutler/mybatis-dynamic-sql.git</developerConnection>
168+
<url>https://github.com/mybatis/mybatis-dynamic-sql</url>
169+
<connection>scm:git:ssh://github.com:mybatis/mybatis-dynamic-sql.git</connection>
170+
<developerConnection>scm:git:ssh://[email protected]:mybatis/mybatis-dynamic-sql.git</developerConnection>
171171
<tag>HEAD</tag>
172172
</scm>
173173
<issueManagement>
174174
<system>GitHub Issue Management</system>
175-
<url>https://github.com/jeffgbutler/mybatis-dynamic-sql/issues</url>
175+
<url>https://github.com/mybatis/mybatis-dynamic-sql/issues</url>
176176
</issueManagement>
177177
<ciManagement>
178178
<system>Travis CI</system>
179-
<url>https://travis-ci.org/jeffgbutler/mybatis-dynamic-sql</url>
179+
<url>https://travis-ci.org/mybatis/mybatis-dynamic-sql</url>
180180
</ciManagement>
181181
<distributionManagement>
182182
<site>
183183
<id>gh-pages</id>
184184
<name>MyBatis Dynamic SQL GitHub Pages</name>
185-
<url>git:ssh://[email protected]/jeffgbutler/mybatis-dynamic-sql.git?gh-pages#</url>
185+
<url>git:ssh://[email protected]/mybatis/mybatis-dynamic-sql.git?gh-pages#</url>
186186
</site>
187187
</distributionManagement>
188188
</project>

‎src/site/markdown/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ The library also supports generating SQL that is formatted for use by Spring JDB
55

66
Please read the user's guide for detailed instructions on use. The user's guide is accessible through menu links to the left.
77

8-
The best examples of usage are the unit tests in the [src\test\java](https://github.com/jeffgbutler/mybatis-dynamic-sql/tree/master/src/test/java) directory in the source repository. They cover all aspects of using the library.
8+
The best examples of usage are the unit tests in the [src\test\java](https://github.com/mybatis/mybatis-dynamic-sql/tree/master/src/test/java) directory in the source repository. They cover all aspects of using the library.

‎travis/after_success.sh

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
3+
# Get Commit Message
4+
commit_message=$(git log --format=%B -n 1)
5+
echo "Current commit detected: ${commit_message}"
6+
7+
# We build for several JDKs on Travis.
8+
# Some actions, like analyzing the code (Coveralls) and uploading
9+
# artifacts on a Maven repository, should only be made for one version.
10+
11+
# If the version is 1.8, then perform the following actions.
12+
# 1. Upload artifacts to Sonatype.
13+
# a. Use -q option to only display Maven errors and warnings.
14+
# b. Use --settings to force the usage of our "settings.xml" file.
15+
# 2. Notify Coveralls.
16+
# a. Use -q option to only display Maven errors and warnings.
17+
# 3. Deploy site (disabled)
18+
# a. Use -q option to only display Maven errors and warnings.
19+
20+
if [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-dynamic-sql" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
21+
22+
if [ $TRAVIS_JDK_VERSION == "oraclejdk8" ]; then
23+
24+
# Deploy to Sonatype
25+
../mvnw clean deploy -q --settings ../travis/settings.xml
26+
echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
27+
28+
# Deploy to Coveralls
29+
../mvnw clean test jacoco:report-integration coveralls:report -q --settings ../travis/settings.xml
30+
echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
31+
32+
# Deploy to site
33+
# various issues exist currently in building this so comment for now
34+
# ../mvnw site site:deploy -q --settings ../travis/settings.xml
35+
# echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
36+
else
37+
echo "Java Version does not support additonal activity for travis CI"
38+
fi
39+
else
40+
echo "Travis Pull Request: $TRAVIS_PULL_REQUEST"
41+
echo "Travis Branch: $TRAVIS_BRANCH"
42+
echo "Travis build skipped"
43+
fi

‎travis/settings.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
4+
<servers>
5+
<server>
6+
<id>ossrh</id>
7+
<username>${env.CI_DEPLOY_USERNAME}</username>
8+
<password>${env.CI_DEPLOY_PASSWORD}</password>
9+
</server>
10+
<server>
11+
<id>gh-pages</id>
12+
<username>git</username>
13+
<password>${env.CI_SITE_PASSWORD}</password>
14+
</server>
15+
</servers>
16+
</settings>

0 commit comments

Comments
 (0)