Skip to content

Commit 31c99b0

Browse files
kazuki43zookazuki43zoo
committed
prepare to transfer to mybatis organization
1 parent d15953a commit 31c99b0

File tree

7 files changed

+125
-14
lines changed

7 files changed

+125
-14
lines changed

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Set default behaviour, in case users don't have core.autocrlf set.
2+
* text=auto

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MyBatis Thymeleaf 3 Support
22

3-
[![Build Status](https://travis-ci.org/kazuki43zoo/thymeleaf-scripting.svg?branch=master)](https://travis-ci.org/kazuki43zoo/thymeleaf-scripting)
4-
[![Coverage Status](https://coveralls.io/repos/github/kazuki43zoo/thymeleaf-scripting/badge.svg?branch=master)](https://coveralls.io/github/kazuki43zoo/thymeleaf-scripting?branch=master)
3+
[![Build Status](https://travis-ci.org/mybatis/thymeleaf-scripting.svg?branch=master)](https://travis-ci.org/mybatis/thymeleaf-scripting)
4+
[![Coverage Status](https://coveralls.io/repos/github/mybatis/thymeleaf-scripting/badge.svg?branch=master)](https://coveralls.io/github/mybatis/thymeleaf-scripting?branch=master)
55
[![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
66

77
![thymeleaf-scripting](http://mybatis.github.io/images/mybatis-logo.png)

‎pom.xml

+18-9
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,45 @@
3434

3535
<name>MyBatis Thymeleaf</name>
3636
<description>Thymeleaf support for MyBatis</description>
37-
<url>https://github.com/kazuki43zoo/thymeleaf-scripting</url>
37+
<url>https://github.com/mybatis/thymeleaf-scripting</url>
3838

3939
<inceptionYear>2018</inceptionYear>
4040

41+
<contributors>
42+
<contributor>
43+
<name>Kazuki Shimizu</name>
44+
<email>kazuki43zoo@gmail.com</email>
45+
</contributor>
46+
</contributors>
47+
4148
<scm>
42-
<url>https://github.com/kazuki43zoo/thymeleaf-scripting</url>
43-
<connection>scm:git:ssh://github.com/kazuki43zoo/thymeleaf-scripting.git</connection>
44-
<developerConnection>scm:git:ssh://git@github.com/kazuki43zoo/thymeleaf-scripting.git</developerConnection>
49+
<url>https://github.com/mybatis/thymeleaf-scripting</url>
50+
<connection>scm:git:ssh://github.com/mybatis/thymeleaf-scripting.git</connection>
51+
<developerConnection>scm:git:ssh://git@github.com/mybatis/thymeleaf-scripting.git</developerConnection>
4552
<tag>HEAD</tag>
4653
</scm>
4754
<issueManagement>
4855
<system>GitHub Issue Management</system>
49-
<url>https://github.com/kazuki43zoo/thymeleaf-scripting/issues</url>
56+
<url>https://github.com/mybatis/thymeleaf-scripting/issues</url>
5057
</issueManagement>
5158
<ciManagement>
5259
<system>Travis CI</system>
53-
<url>https://travis-ci.org/kazuki43zoo/thymeleaf-scripting</url>
60+
<url>https://travis-ci.org/mybatis/thymeleaf-scripting</url>
5461
</ciManagement>
5562
<distributionManagement>
5663
<site>
5764
<id>gh-pages</id>
58-
<name>Mybatis GitHub Pages</name>
59-
<url>git:ssh://git@github.com/kazuki43zoo/thymeleaf-scripting.git?gh-pages#</url>
65+
<name>MyBatis Thymeleaf GitHub Pages</name>
66+
<url>git:ssh://git@github.com/mybatis/thymeleaf-scripting.git?gh-pages#</url>
6067
</site>
6168
</distributionManagement>
6269

6370
<properties>
71+
<!-- Dependencies artifact version -->
6472
<mybatis.version>3.4.6</mybatis.version>
6573
<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
6674

67-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
75+
<!-- Dependencies plugin version -->
6876
<asciidoctor-maven-plugin.version>1.5.7.1</asciidoctor-maven-plugin.version>
6977
</properties>
7078

@@ -73,6 +81,7 @@
7381
<groupId>org.mybatis</groupId>
7482
<artifactId>mybatis</artifactId>
7583
<version>${mybatis.version}</version>
84+
<scope>provided</scope>
7685
</dependency>
7786
<dependency>
7887
<groupId>org.thymeleaf</groupId>

‎src/main/asciidoc/user-guide.adoc

+13-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@
1919
:mybatis-doc-url: http://www.mybatis.org/mybatis-3
2020
:mybatis-spring-boot-doc-url: http://www.mybatis.org/spring-boot-starter
2121
:thymeleaf-doc-url: https://www.thymeleaf.org/doc/tutorials/3.0
22-
:github-organization-url: https://github.com/kazuki43zoo
22+
:github-organization-url: https://github.com/mybatis
2323

2424
== Overview
2525

2626
=== What is MyBatis Thymeleaf ?
2727

28-
The mybatis-thymeleaf is a plugin that helps applying a 2-way SQL to the MyBatis
28+
The mybatis-thymeleaf is a plugin that helps applying a 2-way SQL to the MyBatis 3
2929
using natural template provided by Thymeleaf 3.
30+
31+
If you are not familiar with MyBatis, you can see the MyBatis documentations.
32+
33+
* {mybatis-doc-url}[MyBatis 3 REFERENCE DOCUMENTATION^]
34+
3035
If you are not familiar with Thymeleaf 3 syntax, you can see the Thymeleaf documentations.
3136

3237
* {thymeleaf-doc-url}/usingthymeleaf.html[Tutorial: Using Thymeleaf^]
@@ -139,6 +144,11 @@ If you are using the Maven as build tool, you can add as follow:
139144
[source,xml,subs="specialchars,attributes"]
140145
.pom.xml
141146
----
147+
<dependency>
148+
<groupId>org.mybatis</groupId>
149+
<artifactId>mybatis</artifactId>
150+
<version>3.4.6</version> <!-- Adjust to your application -->
151+
</dependency>
142152
<dependency>
143153
<groupId>org.mybatis.scripting</groupId>
144154
<artifactId>mybatis-thymeleaf</artifactId>
@@ -154,6 +164,7 @@ If you are using the Gradle as build tool, you can add as follow:
154164
.build.gradle
155165
----
156166
dependencies {
167+
compile("org.mybatis:mybatis:3.4.6") // Adjust version to your application
157168
compile("org.mybatis.scripting:mybatis-thymeleaf:{revnumber}")
158169
}
159170
----

‎src/site/xdoc/index.xml

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<section name="What is MyBatis Thymeleaf ?">
3030
<p>
3131
The mybatis-thymeleaf is a plugin that helps applying a 2-way SQL using natural template provided by Thymeleaf 3.
32-
If you are not familiar with Thymeleaf 3 syntax, you can see the Thymeleaf documentations.
3332
</p>
3433
<p>
3534
For details, please see the <a href="./user-guide.html">User's Guide</a>.

‎travis/after_success.sh

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/bash
2+
#
3+
# Copyright 2018 the original author or authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
19+
# Get Commit Message
20+
commit_message=$(git log --format=%B -n 1)
21+
echo "Current commit detected: ${commit_message}"
22+
23+
# We build for several JDKs on Travis.
24+
# Some actions, like analyzing the code (Coveralls) and uploading
25+
# artifacts on a Maven repository, should only be made for one version.
26+
27+
# If the version is 1.8, then perform the following actions.
28+
# 1. Upload artifacts to Sonatype.
29+
# 2. Use -q option to only display Maven errors and warnings.
30+
# 3. Use --settings to force the usage of our "settings.xml" file.
31+
# 4. Notify Coveralls.
32+
# 5. Deploy site
33+
34+
if [ $TRAVIS_REPO_SLUG == "mybatis/thymeleaf-scripting" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
35+
36+
if [ $TRAVIS_JDK_VERSION == "oraclejdk8" ]; then
37+
38+
# Deploy to sonatype
39+
./mvnw clean deploy -q --settings ./travis/settings.xml
40+
echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
41+
42+
# Deploy to coveralls
43+
./mvnw clean test jacoco:report coveralls:report -q --settings ./travis/settings.xml
44+
echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
45+
46+
# Deploy to site
47+
# Cannot currently run site this way
48+
# ./mvnw site site:deploy -q --settings ./travis/settings.xml
49+
# echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
50+
else
51+
echo "Java Version does not support additional activity for travis CI"
52+
fi
53+
else
54+
echo "Travis Pull Request: $TRAVIS_PULL_REQUEST"
55+
echo "Travis Branch: $TRAVIS_BRANCH"
56+
echo "Travis build skipped"
57+
fi

‎travis/settings.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright 2018 the original author or authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
21+
<servers>
22+
<server>
23+
<id>ossrh</id>
24+
<username>${env.CI_DEPLOY_USERNAME}</username>
25+
<password>${env.CI_DEPLOY_PASSWORD}</password>
26+
</server>
27+
<server>
28+
<id>gh-pages</id>
29+
<username>git</username>
30+
<password>${env.CI_SITE_PASSWORD}</password>
31+
</server>
32+
</servers>
33+
</settings>

0 commit comments

Comments
 (0)