Skip to content

Commit

Permalink
update (#2)
Browse files Browse the repository at this point in the history 
* Update dependency org.javassist:javassist to v3.29.2-GA

* Update dependency org.slf4j:slf4j-api to v2.0.1

* Update dependency org.apache.logging.log4j:log4j-api to v2.19.0

* Update dependency org.apache.logging.log4j:log4j-core to v2.19.0

* Update dependency ch.qos.logback:logback-classic to v1.4.1

* [pom] Update project build output timestamp for reproducible builds

* [ci] Correct spelling mistake in proxy factory in better way to avoid naming conflict

Alternative attempt to mybatis#2692

* [maven-release-plugin] prepare release mybatis-3.5.11

* [maven-release-plugin] prepare for next development iteration

* Update dependency org.slf4j:slf4j-api to v2.0.2

* Update junit5 monorepo to v5.9.1

* Referencing collection parameter by name fails

... when the first argument is a special one (i.e. `RowBounds` or `ResultHandler`).

fixes mybatis#2693

* Update dependency org.slf4j:slf4j-api to v2.0.3

* Update dependency org.testcontainers:junit-jupiter to v1.17.4

* Update dependency org.testcontainers:mysql to v1.17.4

* Update dependency org.testcontainers:postgresql to v1.17.4

* Fix a race condition caused by other threads calling mapper methods while mappedStatements are being constructed

* Update dependency ch.qos.logback:logback-classic to v1.4.2

* Update dependency ch.qos.logback:logback-classic to v1.4.3

* Update dependency org.testcontainers:junit-jupiter to v1.17.5

* Update dependency org.testcontainers:mysql to v1.17.5

* Update dependency org.testcontainers:postgresql to v1.17.5

* Update dependency ch.qos.logback:logback-classic to v1.4.4

* Update dependency org.mockito:mockito-junit-jupiter to v4.8.1

* Update dependency mysql:mysql-connector-java to v8.0.31

* Update dependency org.mockito:mockito-core to v4.8.1

* Enable ability to provide custom configuration to XMLConfigBuilder

Supported via the InputStream/Reader constructors

Default constructors will keep using a new configuration

* A subclassed configuration class can now be passed to allow XMLConfigBuilder
to use a specific implementation when creating the configuration

* Adding mapper could fail under JPMS

Under JPMS, ClassLoader#getResources() throws `FileSystemException` it seems.
It might be better to catch IOException, but it could swallow some exception that should be thrown.

Should fix mybatis#2598

* Update mockito monorepo to v4.9.0

* Update dependency org.testcontainers:junit-jupiter to v1.17.6

* Update dependency org.testcontainers:mysql to v1.17.6

* Update dependency org.testcontainers:postgresql to v1.17.6

* Update dependency org.slf4j:slf4j-api to v2.0.4

* Update dependency ch.qos.logback:logback-classic to v1.4.5

* Minor correction: boolean can never be null

* Added failing tests

Some DBs support INSERT, UPDATE or DELETE statement that returns result set.
PostgreSQL has RETURNING
MS SQL Server has OUTPUT

MyBatis can return results by using @select, @SelectProvider or <select />, however, rollback does not work as expected because SELECT does not mark the session 'dirty'.

* Added 'affectData' attribute to SELECT statements

To indicate the SELECT affects DB data.
e.g. PostgreSQL's RETURNING, MS SQL Server's OUTPUT

* Update dependency ch.qos.reload4j:reload4j to v1.2.23

* Bump postgresql from 42.5.0 to 42.5.1

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.5.0...REL42.5.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update dependency org.slf4j:slf4j-api to v2.0.5

* Documentation

* selectCursor() should respect affectData as well

* Update dependency ch.qos.reload4j:reload4j to v1.2.24

* Missing entry in es and ko doc [ci skip]

* Awful typo [ci skip]

* [pom] Update mysql-connector-j to new GAV relocation

* [ci] Use charset with filewriter

* [pom] Add filter to exclude MANIFEST.MF from uber jar from other jars (using ours)

clears warning and behaviour is the same.

* Update dependency org.slf4j:slf4j-api to v2.0.6

* Update mockito monorepo to v4.10.0

* Avoid false-negative

* Update mockito monorepo to v4.11.0

* Update dependency org.mybatis:mybatis-parent to v37

* Resolve resultType by namespace and id when not provide resultType and resultMap

* [actions] Drop jdk 18

* Minor refactoring, more tests

* Update dependency org.assertj:assertj-core to v3.24.1

* Update junit5 monorepo to v5.9.2

* Update mockito monorepo to v5

* Update dependency org.assertj:assertj-core to v3.24.2

* Update dependency com.mysql:mysql-connector-j to v8.0.32

* Update dependency maven to v3.8.7

* Include JDK 21 (EA at this point) in CI build

* [pom] Add mockito subclass support

some of our tests need the legacy style support that mockito made available.  We should look at those in longer term to get on fact that inline is now the default as per mockito we will likely have other issues.

* Update mockito monorepo to v5.1.0

* Update mockito monorepo to v5.1.1

* Update dependency org.postgresql:postgresql to v42.5.2

* [ci] Type the array lists

* Update dependency org.postgresql:postgresql to v42.5.3

* [ci] Sort imports

* [ci] Run partial formatting

* [ci] Update copyright dates

* [ci] Remove extra /p as not required in the javadoc

* [ci] formatting

* [ci] Update copyright dates

* [ci] formatting

* [ci] Update copyright date

* [ci] formatting

* [ci] Formatting

* [ci] formatting

* [ci] formatting

* [ci] formatting

* [ci] formatting

* [ci] Add note about formatting to readme

* [ci] Try adjusting formatting on readme

* [pom] For pre jdk 16 skip impsort

* [ci] Fix readme for formatter tags

* [mvn] Bump to maven 3.9.0 and change maven.config to 3.9/4.x style

* Search readable property when resolving constructor arg type

Should fix mybatis#2803

* Update test code to clarify the consequence

* Update dependency org.postgresql:postgresql to v42.5.4

* Add Unit Test for PooledDataSource

* Using cursor causes OOM mybatis#2812

* [ci] Minor formatting adjustments

* [ci] Import sort new test class

* [ci] Fix end of line markers at end of file per git standards (ie empty last line)

* [ci] Apply open rewrite partially on java cleanup

* [ci] Add private constructors to classes that cannot be instantiated (all static)

* [test] Remove dumb test - not valid now as class is static and should not have been instantiated

* [test] Remove invalid extension of class for testing

* [ci] Tabs to spaces

* [ci] Add final where appropriate per open rewrite

relaxed some of its suggestions but generally took most.

* [pom] Move surefire configuration to parent and make properties more readable

* [pom] Update surefire property usage to non deprecated values

* [ci] Adjust argument

* [ci] Show active profiles being used

* [actions] Drop usage of ci only tests group as unnecessary / directly set excludedGroups

profile is not needed.  All we are doing is setting a property.

* [actions] Run all tests for ubuntu jdk 11 using arglines

* [pom] Add comment on how to disable excluded groups runs

* [pom] Add another comment around excluded groups

* [ci] Add readme that describes how our testing works

* [ci] Do not use star imports (across test classes)

* [ci] Use diamond operators (test classes)

squash with diamond

* [ci] Add missing seial version uid at 1L (throughout tests)

* [ci] Use mockito argument matchers instead of deprecated logic

* [ci] Use 'L' instead of 'l' for long

* [ci] Remove new of primative as known

* [ci] Remove super as no super to call

* [ci] More direct returns to save on GC

* [ci] Various small items cleaning up assignments

* [ci] Better parsing wrapper classes

* [ci] Remove public from methods in interfaces

* [ci] Formatting / update copyright dates

* [ci] Add missing overrides

* [ci] Various small cleanups

* [ci] Use objects class for hash, equals usage

* [ci] Cleanup if statement breaks / return logic

* [ci] Remove unnecessary super calls

* [ci] Make static classes 'static'

* [ci] Remove unnecessary parentheses and allow quicker exit

* [ci] Add missing serial version uid as 1L

* [ci] Use diamond operator

* [ci] Remove named wrapper of list as type given already

* [ci] Remove unused variable from internal method

* [ci] Smarter list creation

* [ci] Update copyright dates

* [ci] Add back type as not until jdk 9 can this be determined

* Add resultOrdered="true" and change expected cursor's nestedResultObjects size to be less than 3

* Update dependency org.apache.logging.log4j:log4j-api to v2.20.0

* Update dependency org.apache.logging.log4j:log4j-core to v2.20.0

* Use CountDownLatch to coordinate the execution order

* [pom] Add some comments in the pom for clarity

* [pom] Remove compiler test compiler argument parameters as not needed now

* [maven-release-plugin] prepare release mybatis-3.5.12

* [maven-release-plugin] prepare for next development iteration

* [ci] Add release backup to gitignore

* [fix] Change formatter around javadoc to retain L&F and correct javadoc error

* [maven-release-plugin] prepare release mybatis-3.5.12

* [maven-release-plugin] prepare for next development iteration

* fix Chinese translation error for `parameterType`

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeremy Landis <jeremylandis@hotmail.com>
Co-authored-by: Iwao AVE! <harawata@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: tianshuang <tianshuang.me@gmail.com>
Co-authored-by: Willie Scholtz <williescholtz@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: FlyInWind <2518509078@qq.com>
Co-authored-by: hogimn <hogimn@gmail.com>
Co-authored-by: gallyamb <gallyamb@gmail.com>
Co-authored-by: puppylpg <shininglhb@163.com>
  • Loading branch information
@grallcd @hazendaz
@harawata @renovate @tianshuang @epochcoder @dependabot @FlyInWind1 @hogimn @gallyamb @puppylpg
11 people committed Mar 6, 2023
1 parent 369ab2b commit 9a79649
Show file tree
Hide file tree
Showing 1,290 changed files with 12,101 additions and 9,311 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
View file
@@ -1,2 +1,2 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
* text=auto
28 changes: 7 additions & 21 deletions .github/workflows/ci.yaml
View file
@@ -1,19 +1,3 @@
#
# Copyright 2009-2021 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Java CI

on: [push, pull_request]
Expand All @@ -24,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
java: [11, 17, 18, 19, 20]
java: [11, 17, 19, 20, 21]
distribution: ['zulu']
fail-fast: false
max-parallel: 4
Expand Down Expand Up @@ -56,18 +40,20 @@ jobs:
- name: Set argLine command line option
if: ${{ matrix.java == '11' }}
run: echo 'ARG_LINE=-D"argLine=--illegal-access=permit"' >> $GITHUB_ENV
- name: Run all tests
if: ${{ matrix.os == 'ubuntu-latest' && matrix.java == '11' }}
run: echo 'ARG_LINE=-D"excludedGroups="' >> $GITHUB_ENV
- name: Skip tests that require illegal reflective access
if: ${{ matrix.os == 'ubuntu-latest' && matrix.java != '11' }}
run: echo 'ARG_LINE=-D"excludedGroups=RequireIllegalAccess"' >> $GITHUB_ENV
- name: Skip tests that require illegal reflective access
if: ${{ matrix.os != 'ubuntu-latest' && matrix.java != '11' }}
run: echo 'ARG_LINE=-D"excludedGroups=TestcontainersTests,RequireIllegalAccess"' >> $GITHUB_ENV
- name: Set env command line option
if: ${{ matrix.os == 'ubuntu-latest' }}
run: echo 'ENV_GITHUB="-Denv.GITHUB"' >> $GITHUB_ENV
- name: Active Profiles
run: ./mvnw help:active-profiles
- name: Test with Maven
if: ${{ matrix.os != 'windows-latest' }}
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_GITHUB $ARG_LINE
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ARG_LINE
- name: Test with Maven
if: ${{ matrix.os == 'windows-latest' && matrix.java == '11' }}
run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" -D"argLine=--illegal-access=permit"
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/coveralls.yaml
View file
@@ -1,19 +1,3 @@
#
# Copyright 2009-2021 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Coveralls

on: [push, pull_request]
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/sonar.yaml
View file
@@ -1,19 +1,3 @@
#
# Copyright 2009-2020 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: SonarCloud

on:
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/sonatype.yaml
View file
@@ -1,19 +1,3 @@
#
# Copyright 2009-2020 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Sonatype

on:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -16,3 +16,4 @@ derby.log
/bin/
.mvn/wrapper/maven-wrapper.jar
.sts4-cache/
*.releaseBackup
3 changes: 2 additions & 1 deletion .mvn/maven.config
View file
@@ -1 +1,2 @@
-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5 --no-transfer-progress
-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5
--no-transfer-progress
2 changes: 1 addition & 1 deletion .mvn/wrapper/MavenWrapperDownloader.java
View file
Expand Up @@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
View file
@@ -1,6 +1,6 @@
## If you have a question or need any help...

Please use [the mailing list](http://groups.google.com/group/mybatis-user) instead of creating issues on the tracker. Thank you!
Please use [the mailing list](https://groups.google.com/group/mybatis-user) instead of creating issues on the tracker. Thank you!

## Reporting a bug

Expand All @@ -9,13 +9,13 @@ Please use [the mailing list](http://groups.google.com/group/mybatis-user) inste

## Proposing a new feature

- It is a good idea to discuss your changes on [the mailing list](http://groups.google.com/group/mybatis-user) to get feedback from the community.
- It is a good idea to discuss your changes on [the mailing list](https://groups.google.com/group/mybatis-user) to get feedback from the community.
- If you have a patch with unit tests, send a pull request. Please see the [Contributing code](CONTRIBUTING.md#contributing-code) section.


## Improving documentation

- Documentations are placed under [src/site](https://github.com/mybatis/mybatis-3/tree/master/src/site) directory in [the xdoc format](http://maven.apache.org/doxia/references/xdoc-format.html), so it is basically the same as creating a patch to contribute documentation changes. Please see the [Contributing code](CONTRIBUTING.md#contributing-code) section.
- Documentations are placed under [src/site](https://github.com/mybatis/mybatis-3/tree/master/src/site) directory in [the xdoc format](https://maven.apache.org/doxia/references/xdoc-format.html), so it is basically the same as creating a patch to contribute documentation changes. Please see the [Contributing code](CONTRIBUTING.md#contributing-code) section.

## Contributing code

Expand All @@ -34,7 +34,7 @@ Please use [the mailing list](http://groups.google.com/group/mybatis-user) inste
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -57,6 +57,6 @@ Here are the steps of a typical workflow.
6. Send a [pull request](https://help.github.com/articles/using-pull-requests).

For steps 1 to 3, please read [this GitHub help](https://help.github.com/articles/fork-a-repo) if you are not familiar with these operations.
Step 4 and 5 are basic [git](http://git-scm.com/) operations. Please see the [online documentation](http://git-scm.com/documentation) for its usage.
Step 4 and 5 are basic [git](https://git-scm.com/) operations. Please see the [online documentation](https://git-scm.com/documentation) for its usage.

For how to write a unit test, please see the [unit test](https://github.com/mybatis/mybatis-3/wiki/Unit-Test) page.
4 changes: 2 additions & 2 deletions ISSUE_TEMPLATE.md
View file
Expand Up @@ -8,7 +8,7 @@ https://stackoverflow.com/questions/ask?tags=mybatis
Question?
======================
Please use the mailing list. http://groups.google.com/group/mybatis-user
Please use the mailing list. https://groups.google.com/group/mybatis-user
Or Stack Overflow with 'mybatis' tag. https://stackoverflow.com/questions/ask?tags=mybatis
Questions on this tracker will be closed without comment.
Expand All @@ -26,7 +26,7 @@ And we spend a lot of time just trying to reproduce the reported problem, so ple
Feature request?
=======================
- Please delete the BUG REPORT FORM below and describe the feature.
- It is a good idea to discuss your changes on the mailing list to get feedback from the community. http://groups.google.com/group/mybatis-user
- It is a good idea to discuss your changes on the mailing list to get feedback from the community. https://groups.google.com/group/mybatis-user
- If you have a patch with unit tests, send a pull request. Please see the wiki page : https://github.com/mybatis/mybatis-3/wiki/Contribute
-->

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
View file
@@ -1,6 +1,6 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -192,7 +192,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
6 changes: 3 additions & 3 deletions NOTICE
View file
@@ -1,14 +1,14 @@
iBATIS
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
The Apache Software Foundation (https://www.apache.org/).

Copyright 2010 The Apache Software Foundation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -59,7 +59,7 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
55 changes: 53 additions & 2 deletions README.md
View file
Expand Up @@ -9,7 +9,7 @@ MyBatis SQL Mapper Framework for Java
[![Stack Overflow](https://img.shields.io/:stack%20overflow-mybatis-brightgreen.svg)](https://stackoverflow.com/questions/tagged/mybatis)
[![Project Stats](https://www.openhub.net/p/mybatis/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mybatis)

![mybatis](http://mybatis.github.io/images/mybatis-logo.png)
![mybatis](https://mybatis.org/images/mybatis-logo.png)

The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented applications.
MyBatis couples objects with stored procedures or SQL statements using an XML descriptor or annotations.
Expand All @@ -18,6 +18,57 @@ Simplicity is the biggest advantage of the MyBatis data mapper over object relat
Essentials
----------

* [See the docs](http://mybatis.github.io/mybatis-3)
* [See the docs](https://mybatis.org/mybatis-3)
* [Download Latest](https://github.com/mybatis/mybatis-3/releases)
* [Download Snapshot](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis/)

Contributions
-------------

Mybatis-core is now being auto formatted. Given nature of some code logic with mybatis, it is more appropriate to force a formatting structure manually for snippets such as sql statements. To do so, add following blocks around code.

- ```// @formatter:off``` to start the block of unformatted code
- ```// @formatter:on``` to end the block of unformatted code

If comment sections need same behaviour such as javadocs, note that the entire block must be around entire comment as direct usage does not properly indicate that formatter treats it all as one comment block regardless.

Tests
-----

Mybatis-3 code runs more expressive testing depending on jdk usage and platform.

By default, we set ```<excludedGroups>TestcontainersTests</excludedGroups>``` which will exclude a subset of tests with @Tag('TestcontainersTests'). Further, if pre jdk 16, we will further exclude record classes from executions further reducing tests.

When using jdk 16+, we adjust the rule to ```<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>```.

When we run on ci platform, we further make adjustments as needed. See [here](.github/workflows/ci.yaml) for details.

As of 2/20/2023, using combined system + jdk will result in given number of tests ran. This will change as tests are added or removed over time.

without adjusting settings (ie use as is, platform does not matter)

- any OS + jdk 11 = 1730 tests
- any OS + jdk 17 = 1710 tests
- any OS + jdk 19 = 1710 tests
- any OS + jdk 20 = 1710 tests
- any OS + jdk 21 = 1710 tests

our adjustments for GH actions where platform does matter

- windows + jdk 11 = 1730 tests
- windows + jdk 17 = 1710 tests
- windows + jdk 19 = 1710 tests
- windows + jdk 20 = 1710 tests
- windows + jdk 21 = 1710 tests

- linux + jdk 11 = 1765 tests
- linux + jdk 17 = 1745 tests
- linux + jdk 19 = 1745 tests
- linux + jdk 20 = 1745 tests
- linux + jdk 21 = 1745 tests

- mac + jdk 11 = 1730 tests
- mac + jdk 17 = 1710 tests
- mac + jdk 19 = 1710 tests
- mac + jdk 20 = 1710 tests
- mac + jdk 21 = 1710 tests
22 changes: 22 additions & 0 deletions format.xml
View file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!DOCTYPE Format>
<Format>
<!-- Dummy format file -->
</Format>
2 changes: 1 addition & 1 deletion mvnw
View file
Expand Up @@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
14 changes: 7 additions & 7 deletions mvnw.cmd
View file
Expand Up @@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
Expand Down Expand Up @@ -141,12 +141,12 @@ if exist %WRAPPER_JAR% (
)

powershell -Command "&{"^
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
Expand Down

0 comments on commit 9a79649

Please sign in to comment.