Skip to content

Commit 8123277

Browse files
osheroffosheroff
committed
Merge remote-tracking branch 'origin/master' into wingerx/master
2 parents 486a447 + 185fccc commit 8123277

30 files changed

+800
-170
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
command: echo "testing under mysql $MYSQL_VERSION"
3636
- run:
3737
name: testit
38-
command: mvn verify
38+
command: mvn verify -Dgpg.skip
3939
- store_artifacts:
4040
path: test.log
4141

‎.github/workflows/mysql-57.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Copyright Gunnar Morling
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
# This workflow will build a Java project with Maven
17+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
18+
19+
name: Build and run tests against MySQL 5.7
20+
21+
on:
22+
push:
23+
branches: [ main ]
24+
pull_request:
25+
branches: [ main ]
26+
27+
jobs:
28+
build:
29+
30+
runs-on: ubuntu-latest
31+
32+
steps:
33+
- uses: actions/checkout@v2
34+
- name: Set up JDK 11
35+
uses: actions/setup-java@v1
36+
with:
37+
java-version: 11
38+
- name: Cache Maven packages
39+
uses: actions/cache@v1
40+
with:
41+
path: ~/.m2
42+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
43+
restore-keys: ${{ runner.os }}-m2
44+
- name: Build with Maven
45+
run: mvn -B install --file pom.xml

‎.github/workflows/mysql-80.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Copyright Gunnar Morling
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
# This workflow will build a Java project with Maven
17+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
18+
19+
name: Build and run tests against MySQL 8.0
20+
21+
on:
22+
push:
23+
branches: [ main ]
24+
pull_request:
25+
branches: [ main ]
26+
27+
jobs:
28+
build:
29+
30+
runs-on: ubuntu-latest
31+
32+
steps:
33+
- uses: actions/checkout@v2
34+
- name: Set up JDK 11
35+
uses: actions/setup-java@v1
36+
with:
37+
java-version: 11
38+
- name: Cache Maven packages
39+
uses: actions/cache@v1
40+
with:
41+
path: ~/.m2
42+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
43+
restore-keys: ${{ runner.os }}-m2
44+
- name: Build with Maven
45+
run: MYSQL_VERSION=8.0 mvn -B install --file pom.xml

‎.mvn/maven.config‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.mvn/settings.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
# Changelog
2+
## [0.26.1](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.26.0...0.26.1) - 2022-07-18
3+
4+
- fix deadlock with disconnect and keepalive thread.
5+
6+
## [0.26.0](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.6...0.26.0) - 2022-07-15
7+
8+
- Compressed binlogs, thank you Somesh Malviya
9+
- fix crash on unknown field type
10+
11+
# Changelog
12+
13+
## [0.25.6](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.5...0.25.6) - 2022-04-14
14+
15+
- stop crashing in an inopportune place
16+
17+
## [0.25.5](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.4...0.25.5) - 2022-01-28
18+
19+
- mysql 8 also puts JSON keys in any damn place it likes
20+
21+
## [0.25.4](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.3...0.25.4) - 2021-10-13
22+
23+
- add debugging info to eof exception
24+
25+
## [0.25.3](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.2...0.25.3) - 2021-07-29
26+
27+
- support mysql 8's invisible columns
228

329
## [0.25.2](https://github.com/osheroff/mysql-binlog-connector-java/compare/0.25.1...0.25.2) - 2021-06-25
430

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,10 @@ mvn # shows how to build, test, etc. project
229229

230230
## Deployment
231231

232-
First:
233-
http://maven.apache.org/guides/mini/guide-encryption.html
232+
setup your settings.xml to have a "central" entry.
234233

235-
Secondly:
236234
```
237-
export OSS_SONATYPE_ORG_USERNAME=username
238-
export OSS_SONATYPE_ORG_PASSWORD={encryptedpasswordJF!#$flkj}
235+
mvn deploy
239236
```
240237

241238
## Contributing

‎pom.xml‎

Lines changed: 59 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.zendesk</groupId>
66
<artifactId>mysql-binlog-connector-java</artifactId>
7-
<version>0.25.2</version>
7+
<version>0.26.1</version>
88

99
<name>mysql-binlog-connector-java</name>
1010
<description>MySQL Binary Log connector</description>
@@ -33,14 +33,6 @@
3333
<name>Ben Osheroff</name>
3434
</developer>
3535
</developers>
36-
<distributionManagement>
37-
<repository>
38-
<id>maven-central</id>
39-
<name>Sonatype Nexus Staging</name>
40-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
41-
</repository>
42-
</distributionManagement>
43-
4436
<properties>
4537
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4638
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -85,21 +77,28 @@
8577
<version>2.9.10.3</version>
8678
<scope>test</scope>
8779
</dependency>
80+
<dependency>
81+
<groupId>com.github.luben</groupId>
82+
<artifactId>zstd-jni</artifactId>
83+
<version>1.5.0-2</version>
84+
<scope>compile</scope>
85+
</dependency>
8886
</dependencies>
89-
90-
<reporting>
91-
<plugins>
92-
<plugin>
93-
<!-- added to suppress "[WARNING] Unable to locate Source XRef to link to - DISABLED" -->
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-jxr-plugin</artifactId>
96-
<version>2.3</version>
97-
</plugin>
98-
</plugins>
99-
</reporting>
100-
10187
<build>
10288
<plugins>
89+
<plugin>
90+
<groupId>org.sonatype.plugins</groupId>
91+
<artifactId>nexus-staging-maven-plugin</artifactId>
92+
<version>1.6.6</version>
93+
<extensions>true</extensions>
94+
<configuration>
95+
<serverId>central</serverId>
96+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
97+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
98+
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
99+
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
100+
</configuration>
101+
</plugin>
103102
<plugin>
104103
<groupId>org.apache.maven.plugins</groupId>
105104
<artifactId>maven-compiler-plugin</artifactId>
@@ -121,14 +120,6 @@
121120
</archive>
122121
</configuration>
123122
</plugin>
124-
<plugin>
125-
<groupId>org.apache.maven.plugins</groupId>
126-
<artifactId>maven-deploy-plugin</artifactId>
127-
<version>2.8.2</version>
128-
<configuration>
129-
<skip>true</skip>
130-
</configuration>
131-
</plugin>
132123
<plugin>
133124
<groupId>org.apache.maven.plugins</groupId>
134125
<artifactId>maven-surefire-plugin</artifactId>
@@ -158,35 +149,48 @@
158149
</executions>
159150
</plugin>
160151
<plugin>
161-
<groupId>com.github.shyiko.usage-maven-plugin</groupId>
162-
<artifactId>usage-maven-plugin</artifactId>
163-
<version>1.0.0</version>
164-
<configuration>
165-
<usage>
166-
# build everything (append "-DskipTests=true" if you wish to skip tests)
167-
./mvnw clean package
168-
169-
# run unit + integration tests
170-
./mvnw -P coverage clean verify
171-
# use -Dvagrant.integration.box= to switch between MySQL sandboxes
172-
173-
# publish a new version
174-
./mvnw versions:set -DnewVersion=&lt;version&gt;
175-
./mvnw -Ddeploy=maven-central
176-
git tag &lt;version&gt; &amp;&amp; git push origin &lt;version&gt;
177-
</usage>
178-
</configuration>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-source-plugin</artifactId>
154+
<version>3.2.1</version>
155+
<executions>
156+
<execution>
157+
<id>attach-sources</id>
158+
<phase>verify</phase>
159+
<goals>
160+
<goal>jar-no-fork</goal>
161+
</goals>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
<plugin>
166+
<groupId>org.apache.maven.plugins</groupId>
167+
<artifactId>maven-javadoc-plugin</artifactId>
168+
<version>3.2.0</version>
169+
<executions>
170+
<execution>
171+
<id>attach-javadocs</id>
172+
<goals>
173+
<goal>jar</goal>
174+
</goals>
175+
</execution>
176+
</executions>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-gpg-plugin</artifactId>
181+
<version>1.6</version>
182+
<executions>
183+
<execution>
184+
<id>sign-artifacts</id>
185+
<phase>verify</phase>
186+
<goals>
187+
<goal>sign</goal>
188+
</goals>
189+
</execution>
190+
</executions>
179191
</plugin>
180192
</plugins>
181-
<extensions>
182-
<extension>
183-
<groupId>com.github.shyiko.usage-maven-plugin</groupId>
184-
<artifactId>usage-maven-plugin</artifactId>
185-
<version>1.0.0</version>
186-
</extension>
187-
</extensions>
188193
</build>
189-
190194
<profiles>
191195
<profile>
192196
<id>mysql-8-compat</id>
@@ -199,72 +203,6 @@
199203
</dependency>
200204
</dependencies>
201205
</profile>
202-
<profile>
203-
<id>deploy-to-maven-central</id>
204-
<activation>
205-
<property>
206-
<name>deploy</name>
207-
<value>maven-central</value>
208-
</property>
209-
</activation>
210-
<build>
211-
<defaultGoal>clean deploy</defaultGoal>
212-
<plugins>
213-
<plugin>
214-
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-source-plugin</artifactId>
216-
<version>3.2.1</version>
217-
<executions>
218-
<execution>
219-
<id>attach-sources</id>
220-
<phase>verify</phase>
221-
<goals>
222-
<goal>jar-no-fork</goal>
223-
</goals>
224-
</execution>
225-
</executions>
226-
</plugin>
227-
<plugin>
228-
<groupId>org.apache.maven.plugins</groupId>
229-
<artifactId>maven-javadoc-plugin</artifactId>
230-
<version>3.2.0</version>
231-
<executions>
232-
<execution>
233-
<id>attach-javadocs</id>
234-
<goals>
235-
<goal>jar</goal>
236-
</goals>
237-
</execution>
238-
</executions>
239-
</plugin>
240-
<plugin>
241-
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-gpg-plugin</artifactId>
243-
<version>1.6</version>
244-
<executions>
245-
<execution>
246-
<id>sign-artifacts</id>
247-
<phase>verify</phase>
248-
<goals>
249-
<goal>sign</goal>
250-
</goals>
251-
</execution>
252-
</executions>
253-
</plugin>
254-
<plugin>
255-
<groupId>org.sonatype.plugins</groupId>
256-
<artifactId>nexus-staging-maven-plugin</artifactId>
257-
<version>1.6.8</version>
258-
<extensions>true</extensions>
259-
<configuration>
260-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
261-
<serverId>maven-central</serverId>
262-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
263-
</configuration>
264-
</plugin>
265-
</plugins>
266-
</build>
267-
</profile>
268206
</profiles>
269207

270208
</project>

0 commit comments

Comments
 (0)