Skip to content

Commit d6c1a09

Browse files
committed
Update 1.x branch to main
Closes #126
1 parent 081d6d7 commit d6c1a09

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

.github/workflows/publish-central.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release to Maven Central (Deploy Snapshot)
22

33
on:
44
push:
5-
branches: [master, 1.x, release]
5+
branches: [main, release]
66

77
jobs:
88
release:

.github/workflows/publish-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish documentation to the project page
22

33
on:
44
push:
5-
branches: [ 1.x, release ]
5+
branches: [ main, release ]
66

77
jobs:
88
publish:
@@ -38,7 +38,7 @@ jobs:
3838
# `-- api/
3939

4040
- name: Prepare "snapshot" documents
41-
if: "github.ref == 'refs/heads/1.x' && contains(env.project_version, 'snapshot')"
41+
if: "github.ref == 'refs/heads/main' && contains(env.project_version, 'snapshot')"
4242
run: |
4343
mkdir -p target/deploy-documents/snapshot/user-guide/
4444
mkdir -p target/deploy-documents/snapshot/api/

README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77

88
Provide proxy classes for JDBC API to intercept executing queries and methods.
99

10-
### Versions
11-
12-
- 2.x _(Under development)_
13-
- ~~Java8 baseline.~~
14-
- `master` branch
15-
16-
- 1.x
17-
- Works with JDK1.6+ (works well with Java8 and above).
18-
- `1.x` branch
19-
2010
## User Guide
2111

2212
- [Current Release Version][user-guide-current]
@@ -36,7 +26,7 @@ Provide proxy classes for JDBC API to intercept executing queries and methods.
3626
- latest version is: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.ttddyy/datasource-proxy/badge.svg)][maven-central_badge]
3727
- No dependencies to other libraries, everything is optional.
3828
- For example, if you want to use slf4j logger with `SLF4JQueryLoggingListener`, then you need slf4j library.
39-
- requires jdk1.6+
29+
- requires jdk1.6+ (works well with Java8 and above).
4030

4131
Snapshots are available via the Maven Central repository.
4232
For instructions on how to consume snapshot releases, please refer to [the official documentation](https://central.sonatype.org/publish/publish-portal-snapshots/#consuming-snapshot-releases-for-your-project).
@@ -47,9 +37,6 @@ For instructions on how to consume snapshot releases, please refer to [the offic
4737
*Examples:*
4838
- [datasource-proxy-examples][datasource-proxy-examples]
4939

50-
*Unit test support:*
51-
- [datasource-assert][datasource-assert]
52-
5340

5441
## Javadoc
5542

@@ -66,4 +53,3 @@ For instructions on how to consume snapshot releases, please refer to [the offic
6653
[javadoc-current]: http://jdbc-observations.github.io/datasource-proxy/docs/current/api/
6754
[javadoc-snapshot]: http://jdbc-observations.github.io/datasource-proxy/docs/snapshot/api/
6855
[datasource-proxy-examples]: https://github.com/ttddyy/datasource-proxy-examples
69-
[datasource-assert]: https://github.com/ttddyy/datasource-assert

0 commit comments

Comments
 (0)