Skip to content

Commit dbdede9

Browse files
hazendazhazendaz
authored
Merge 051035b into 7e2fa63 
2 parents 7e2fa63 + 051035b commit dbdede9

File tree

7 files changed

+67
-131
lines changed

7 files changed

+67
-131
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
1-
#
2-
# Copyright 2011-2021 the original author or authors.
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-
171
name: Java CI
182

19-
on: [push, pull_request]
3+
on: [workflow_dispatch, push, pull_request]
204

215
jobs:
226
test:
237
runs-on: ${{ matrix.os }}
248
strategy:
259
matrix:
26-
os: [ubuntu-latest, macOS-latest, windows-latest]
27-
java: [11, 17, 21]
28-
distribution: ['zulu']
10+
os: [ubuntu-latest, macos-latest, windows-latest]
11+
java: [11, 17, 21, 22-ea]
12+
distribution: ['temurin']
2913
fail-fast: false
3014
max-parallel: 4
3115
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
3216

3317
steps:
3418
- uses: actions/checkout@v4
35-
- name: Set up JDK
19+
- name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
3620
uses: actions/setup-java@v3
3721
with:
3822
java-version: ${{ matrix.java }}

‎.github/workflows/coveralls.yaml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
#
2-
# Copyright 2011-2021 the original author or authors.
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-
171
name: Coveralls
182

193
on: [push, pull_request]
@@ -31,12 +15,12 @@ jobs:
3115
distribution: zulu
3216
- name: Report Coverage to Coveralls for Pull Requests
3317
if: github.event_name == 'pull_request'
34-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
18+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
3519
env:
3620
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3721
PR_NUMBER: ${{ github.event.number }}
3822
- name: Report Coverage to Coveralls for General Push
3923
if: github.event_name == 'push'
40-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
24+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress
4125
env:
4226
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sonar.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
#
2-
# Copyright 2011-2021 the original author or authors.
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-
171
name: SonarCloud
182

193
on:

‎.github/workflows/sonatype.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
#
2-
# Copyright 2011-2021 the original author or authors.
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-
171
name: Sonatype
182

193
on:

‎mybatis-scala-core/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
<name>mybatis-scala-core</name>
3232

3333
<scm>
34-
<url>http://github.com/mybatis/scala</url>
3534
<connection>scm:git:ssh://github.com/mybatis/scala.git</connection>
3635
<developerConnection>scm:git:ssh://git@github.com/mybatis/scala.git</developerConnection>
3736
<tag>HEAD</tag>
37+
<url>http://github.com/mybatis/scala</url>
3838
</scm>
3939

4040
<dependencies>
@@ -66,6 +66,17 @@
6666
</dependencies>
6767

6868
<build>
69+
70+
<resources>
71+
<resource>
72+
<targetPath>META-INF</targetPath>
73+
<directory>${project.basedir}/../</directory>
74+
<includes>
75+
<include>LICENSE</include>
76+
<include>NOTICE</include>
77+
</includes>
78+
</resource>
79+
</resources>
6980
<plugins>
7081
<plugin>
7182
<groupId>net.alchim31.maven</groupId>
@@ -87,7 +98,7 @@
8798
<groupId>org.apache.maven.plugins</groupId>
8899
<artifactId>maven-surefire-plugin</artifactId>
89100
<configuration>
90-
<skipTests>true</skipTests>
101+
<skipTests>true</skipTests>
91102
</configuration>
92103
</plugin>
93104
<plugin>
@@ -109,17 +120,6 @@
109120
</executions>
110121
</plugin>
111122
</plugins>
112-
113-
<resources>
114-
<resource>
115-
<directory>${project.basedir}/../</directory>
116-
<targetPath>META-INF</targetPath>
117-
<includes>
118-
<include>LICENSE</include>
119-
<include>NOTICE</include>
120-
</includes>
121-
</resource>
122-
</resources>
123123
</build>
124124

125125
<reporting>

‎mybatis-scala-samples/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
<name>mybatis-scala-samples</name>
3131

3232
<scm>
33-
<url>http://github.com/mybatis/scala</url>
3433
<connection>scm:git:ssh://github.com/mybatis/scala.git</connection>
3534
<developerConnection>scm:git:ssh://git@github.com/mybatis/scala.git</developerConnection>
3635
<tag>HEAD</tag>
36+
<url>http://github.com/mybatis/scala</url>
3737
</scm>
3838

3939
<dependencies>
@@ -55,33 +55,33 @@
5555
</dependencies>
5656

5757
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>net.alchim31.maven</groupId>
61-
<artifactId>scala-maven-plugin</artifactId>
62-
</plugin>
63-
64-
<plugin>
65-
<artifactId>maven-deploy-plugin</artifactId>
66-
<configuration>
67-
<skip>true</skip>
68-
</configuration>
69-
</plugin>
70-
</plugins>
7158

7259
<resources>
7360
<resource>
7461
<directory>${project.basedir}/src/main/resources</directory>
7562
</resource>
7663
<resource>
77-
<directory>${project.basedir}/../</directory>
7864
<targetPath>META-INF</targetPath>
65+
<directory>${project.basedir}/../</directory>
7966
<includes>
8067
<include>LICENSE</include>
8168
<include>NOTICE</include>
8269
</includes>
8370
</resource>
8471
</resources>
72+
<plugins>
73+
<plugin>
74+
<groupId>net.alchim31.maven</groupId>
75+
<artifactId>scala-maven-plugin</artifactId>
76+
</plugin>
77+
78+
<plugin>
79+
<artifactId>maven-deploy-plugin</artifactId>
80+
<configuration>
81+
<skip>true</skip>
82+
</configuration>
83+
</plugin>
84+
</plugins>
8585
</build>
8686

8787
</project>

‎pom.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>org.mybatis</groupId>
2424
<artifactId>mybatis-parent</artifactId>
2525
<version>40</version>
26-
<relativePath />
26+
<relativePath/>
2727
</parent>
2828

2929
<groupId>org.mybatis.scala</groupId>
@@ -42,10 +42,10 @@
4242
</modules>
4343

4444
<scm>
45-
<url>http://github.com/mybatis/scala</url>
4645
<connection>scm:git:ssh://git@github.com/mybatis/scala.git</connection>
4746
<developerConnection>scm:git:ssh://git@github.com/mybatis/scala.git</developerConnection>
4847
<tag>HEAD</tag>
48+
<url>http://github.com/mybatis/scala</url>
4949
</scm>
5050
<issueManagement>
5151
<system>GitHub Issue Management</system>
@@ -75,19 +75,22 @@
7575
<project.build.outputTimestamp>1671291815</project.build.outputTimestamp>
7676
</properties>
7777

78-
<build>
79-
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
80-
<testSourceDirectory>${project.basedir}src/test/scala</testSourceDirectory>
78+
<dependencyManagement>
79+
<dependencies>
80+
<dependency>
81+
<groupId>org.scala-lang</groupId>
82+
<artifactId>scala-library</artifactId>
83+
<version>${scala.version}</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.scala-lang.modules</groupId>
87+
<artifactId>scala-xml_${scala.binary}</artifactId>
88+
<version>2.2.0</version>
89+
</dependency>
90+
</dependencies>
91+
</dependencyManagement>
8192

82-
<plugins>
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-release-plugin</artifactId>
86-
<configuration>
87-
<releaseProfiles>release,bundle</releaseProfiles>
88-
</configuration>
89-
</plugin>
90-
</plugins>
93+
<build>
9194

9295
<pluginManagement>
9396
<plugins>
@@ -98,7 +101,7 @@
98101
<configuration>
99102
<args>
100103
<arg>-deprecation</arg>
101-
<arg>-feature</arg>
104+
<arg>-feature</arg>
102105
</args>
103106
</configuration>
104107
<executions>
@@ -120,22 +123,19 @@
120123
</plugin>
121124
</plugins>
122125
</pluginManagement>
123-
</build>
124126

125-
<dependencyManagement>
126-
<dependencies>
127-
<dependency>
128-
<groupId>org.scala-lang</groupId>
129-
<artifactId>scala-library</artifactId>
130-
<version>${scala.version}</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>org.scala-lang.modules</groupId>
134-
<artifactId>scala-xml_${scala.binary}</artifactId>
135-
<version>2.2.0</version>
136-
</dependency>
137-
</dependencies>
138-
</dependencyManagement>
127+
<plugins>
128+
<plugin>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-release-plugin</artifactId>
131+
<configuration>
132+
<releaseProfiles>release,bundle</releaseProfiles>
133+
</configuration>
134+
</plugin>
135+
</plugins>
136+
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
137+
<testSourceDirectory>${project.basedir}src/test/scala</testSourceDirectory>
138+
</build>
139139

140140
<profiles>
141141
<profile>
@@ -167,8 +167,8 @@
167167
</goals>
168168
</pluginExecutionFilter>
169169
<action>
170-
<ignore />
171-
</action>
170+
<ignore/>
171+
</action>
172172
</pluginExecution>
173173
</pluginExecutions>
174174
</lifecycleMappingMetadata>

0 commit comments

Comments
 (0)