Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflict #123

Merged
merged 60 commits into from
Oct 2, 2023
Merged

Resolve conflict #123

merged 60 commits into from
Oct 2, 2023

Conversation

hajk1
Copy link
Collaborator

@hajk1 hajk1 commented Oct 2, 2023

No description provided.

hajk1 and others added 30 commits October 13, 2020 20:34
- remove deprecated parent pom
- bump java version to 1.8
- add maven wrapper
- bump versions
- change broken project URL to GitHub project URL
- add maven wrapper
Added correct BbanStructure for Gabon and included Test case
* update junit version to 5

* update junit version to 5

* test cases refactored

* test cases refactored

* test cases refactored

* test cases refactored to new class

* test cases refactored

* test cases refactored

* test cases refactored

* Parametrized test cases refactored

* Hamcrest test cases refactored

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case

* fixing test case
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action

* testing github action
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action

* testing github action

* update java adopt jdk badge
* update java adopt jdk badge

* adding non default padded character

* adding branch code to use padding left

* change the README.md

* release 3.2.6-RELEASE
hajk1 and others added 27 commits October 2, 2023 11:38
* add GHA for maven verify

* add GHA for maven verify

* add test report step

* experimenting with some other reporting actions

* tweaking GHA

* tweaking GHA

* tweaking GHA

* tweaking GHA

* rm broken/buggy test report actions

* try fixing jacoco report

* rm jacoco report upload

* rm jacoco report upload

* rm jacoco report upload
updated to show 3.2.7 release
* Adding Cap Verde structure

* Adding tests for CV

---------

Co-authored-by: RHoog <[email protected]>
* fix spelling mistake, ibanContruction -> ibanConstruction

* add overload to allow passing a custom Random

- add toString() to BbanStructureEntry.java
- tests to check if randomness is deterministic
- add additional tests for validity of BbanStructureEntry.java
- TODO figure out if 'c' can generate a-z

* remove TODO - a-z is not required

* fix code suggestions/warnings

* update tests to JUnit5

* remove duplicated `ibanConstructionRandom()` test

* update assertions

* fix test name after merge

* update expected random values

* re-add accidentally removed test

---------

Co-authored-by: aSemy <[email protected]>
# Conflicts:
#	pom.xml
#	src/test/java/org/iban4j/IbanTest.java
Added correct BbanStructure for Gabon and included Test case
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action
Added correct BbanStructure for Gabon and included Test case
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action
…mote-sync

# Conflicts:
#	pom.xml
#	src/test/java/org/iban4j/IbanTest.java
Added correct BbanStructure for Gabon and included Test case
* testing github action

* testing github action java

* testing github action java

* testing github action

* testing github action

* testing github action
Copy link
Collaborator Author

@hajk1 hajk1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to check the tests

@hajk1 hajk1 merged commit e2d25eb into arturmkrtchyan:master Oct 2, 2023
1 check failed
@hajk1 hajk1 deleted the resolve-conflict branch October 2, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants