-
Notifications
You must be signed in to change notification settings - Fork 68
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
SRU2023 v10.1 #85
base: main
Are you sure you want to change the base?
SRU2023 v10.1 #85
Changes from all commits
41a8b2a
f6c3916
f8d27da
42ae48f
7a7b3fe
180a9db
3365f3d
b2834db
a9241f2
dea1b04
e402d4e
e210ed7
4e6a4a4
0e67b9c
70ca19f
6861c53
997b7e0
2bad01d
d25c9f9
f756ac5
e79d7d6
83aab22
fd594dc
fd6b0d4
f93b1a7
543017e
1aac9ca
4cf7bdc
063c7d0
e07498b
1e46c80
974d32b
210edbc
4b52fa5
6e0df47
756c64d
1ee7a31
c2f286b
952f49d
926a2cd
a628df2
f34c719
b902944
981b3df
bb44696
b10476c
8e4e55d
cf5c986
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,5 +29,6 @@ lib | |
.idea/jpa-buddy.xml | ||
release.sh | ||
.idea/sonarlint | ||
.java-version | ||
*.hprof | ||
.idea/copilot |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1,28 +1,39 @@ | ||||||||
# Prowide ISO 20022 - CHANGELOG | ||||||||
|
||||||||
#### 9.4.6 - May 2024 | ||||||||
* (PW-1875) Fixed the `ZuluDateTimeAdapter` to convert the datetime to UTC offset if needed | ||||||||
#### 9.4.5 - May 2024 | ||||||||
#### 10.1.7 - August 2024 | ||||||||
* (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unordered list indentation. The list item is not properly indented. Ensure consistent indentation for unordered list items. - * (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null
+* (PW-1958) Fixed the `DefaultMxMetadataStrategy` NPE issue when the amount values are null Committable suggestion
Suggested change
ToolsMarkdownlint
|
||||||||
|
||||||||
#### 10.1.6 - May 2024 | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing blank line after heading. Headings should be surrounded by blank lines for better readability. -#### 10.1.6 - May 2024
+#### 10.1.6 - May 2024
Committable suggestion
Suggested change
ToolsMarkdownlint
|
||||||||
* (PW-1875) Changed the BusinessApplicationHeaderV01 marshaller to always use Zulu timezone with "Z" indicator | ||||||||
|
||||||||
#### 9.4.4 - January 2024 | ||||||||
|
||||||||
#### 10.1.5 - April 2024 | ||||||||
* Update jaxb dependency from com.sun.xml.bind:jaxb-impl:4.0.2 to 4.0.5 containing several jaxb bugfixes | ||||||||
|
||||||||
#### 10.1.4 - January 2024 | ||||||||
* Enhanced the identifier extraction of the MxSwiftMessage to use the AppHdr when the Document namespace is missing | ||||||||
* Enhanced the generic AbstractMX#parse to detect the message type from the AppHdr when the Document namespace is missing | ||||||||
* Added default metadata extraction implementation for pacs and camt amounts and value dates | ||||||||
* Added default methods for sender, receiver, and identifier extraction to the MxSwiftMessage. | ||||||||
* Replaced the DistinguishedName parse logic with proprietary util class from the Prowide Core library | ||||||||
|
||||||||
#### 9.4.3 - August 2023 | ||||||||
#### 10.1.3 - August 2023 | ||||||||
* (PW-1566) Fixed manipulation of nanoseconds in the OffsetTime and OffsetDateTime adapters | ||||||||
* Enhanced metadata extraction for xsys messages getting sender/receiver BICs from the RequestHeader element | ||||||||
* Make the message metadata extraction lenient, by fixing the XML instruction of the payload when it contains invalid case | ||||||||
|
||||||||
#### 9.4.2 - July 2023 | ||||||||
#### 10.1.2 - August 2023 | ||||||||
* Added new utility class SupplementaryDataUtils to facilitate "SplmtryData" extraction from MX messages | ||||||||
|
||||||||
#### 9.4.1 - June 2023 | ||||||||
#### 10.1.1 - July 2023 | ||||||||
* (PW-1392) Fixed the default escape handler when serializing model objects into XML, that was duplicated quote characters in the output | ||||||||
|
||||||||
#### 10.1.0 - June 2023 | ||||||||
* Migration to Java 11 | ||||||||
* Migration to Jakarta EE 10 | ||||||||
* XmlGregorianCalendar was replaced model-wide by the new java.time classes | ||||||||
* Fixed AppHdrFactory creation to use UTC in the header default creation date time | ||||||||
* Fixed the business application header V01 serialization to use Zulu time indicator instead of +00:00 offset | ||||||||
|
||||||||
#### 9.4.0 - May 2023 | ||||||||
* SWIFT Standard release update 2023 (live 19 November 2023) | ||||||||
* Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2022/getting-started/deprecation/) | ||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,10 @@ buildscript { | |
gradlePluginPortal() | ||
} | ||
dependencies { | ||
classpath 'ru.vyarus:gradle-quality-plugin:4.7.0' | ||
classpath 'pl.allegro.tech.build:axion-release-plugin:1.13.6' | ||
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' | ||
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.13.0' // above this version requires Java 11 | ||
classpath 'ru.vyarus:gradle-quality-plugin:4.9.0' | ||
classpath 'pl.allegro.tech.build:axion-release-plugin:1.15.1' | ||
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0' | ||
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.23.3' | ||
} | ||
} | ||
apply plugin: 'pl.allegro.tech.build.axion-release' | ||
|
@@ -40,7 +40,7 @@ allprojects { | |
options.encoding = 'UTF-8' | ||
java { | ||
toolchain { | ||
languageVersion.set(JavaLanguageVersion.of(8)) | ||
languageVersion.set(JavaLanguageVersion.of(11)) | ||
} | ||
} | ||
doLast { | ||
|
@@ -60,6 +60,13 @@ allprojects { | |
username "${project.prowideRepoUser}" | ||
password "${project.prowideRepoPass}" | ||
} | ||
} | ||
maven { | ||
url "${project.prowideRepo}/repository/maven-snapshots/" | ||
credentials { | ||
username "${project.prowideRepoUser}" | ||
password "${project.prowideRepoPass}" | ||
} | ||
maven { | ||
url "${project.prowideRepo}/repository/maven-snapshots/" | ||
credentials { | ||
|
@@ -71,7 +78,11 @@ allprojects { | |
} | ||
} | ||
|
||
sourceSets.main.java.srcDirs = ['src/main/java', 'src/generated/java'] | ||
sourceSets.named('main') { | ||
java { | ||
setSrcDirs(['src/main/java', 'src/generated/java']) | ||
} | ||
} | ||
|
||
tasks.withType(Jar) { | ||
manifest.attributes( | ||
|
@@ -82,8 +93,8 @@ allprojects { | |
'Implementation-Version': project.version, | ||
'Implementation-Vendor': 'www.prowidesoftware.com', | ||
'Built-OS': System.getProperty('os.name'), | ||
'Source-Compatibility': project.sourceCompatibility, | ||
'Target-Compatibility': project.targetCompatibility, | ||
'Source-Compatibility': JavaVersion.VERSION_11, | ||
'Target-Compatibility': JavaVersion.VERSION_11, | ||
'Built-Date': new Date().format("yyyy-MM-dd"), | ||
'Automatic-Module-Name': 'com.prowidesoftware.iso20022' | ||
) | ||
|
@@ -98,6 +109,9 @@ subprojects { | |
dependencies { | ||
implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
implementation 'com.google.code.gson:gson:2.9.0' | ||
implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
// bind-api is included transitively by jaxb-impl | ||
// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
} | ||
|
||
tasks.withType(Jar) { | ||
|
@@ -118,8 +132,14 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) { | |
dependencies { | ||
api project(':iso20022-core') | ||
implementation project(specificTypesProject) | ||
|
||
implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
implementation 'com.google.code.gson:gson:2.9.0' | ||
|
||
implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
// bind-api is included transitively by jaxb-impl | ||
// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
|
||
compileOnly 'javax.persistence:javax.persistence-api:2.2' | ||
} | ||
} | ||
|
@@ -134,15 +154,15 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) { | |
project(':iso20022-core') { | ||
dependencies { | ||
// included build | ||
api 'com.prowidesoftware:pw-swift-core:SRU2023-9.4.16' | ||
api 'com.prowidesoftware:pw-swift-core:SRU2023-10.1.15' | ||
|
||
implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
implementation 'com.google.code.gson:gson:2.9.0' | ||
|
||
compileOnly 'javax.persistence:javax.persistence-api:2.2' | ||
compileOnly 'javax.validation:validation-api:2.0.1.Final' | ||
compileOnly 'jakarta.persistence:jakarta.persistence-api:3.1.0' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Tip Codebase Verification Ensure Complete Transition to Jakarta Persistence API The
Analysis chainTransition to Jakarta Persistence API: Ensure Compatibility. The transition from Also applies to: 165-165 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Description: Verify compatibility of the transition to `jakarta.persistence`.
# Test: Search for any `javax.persistence` usage that might need updating.
rg --type java 'javax\.persistence'
Length of output: 37 Script: #!/bin/bash
# Description: Search for any `javax.persistence` references in XML configuration files or other build scripts.
# Search in XML files for `javax.persistence` usage.
rg --type xml 'javax\.persistence'
# Search in other Gradle build files for `javax.persistence` usage.
rg --type gradle 'javax\.persistence'
Length of output: 149 |
||
compileOnly 'jakarta.validation:jakarta.validation-api:3.0.2' | ||
|
||
testImplementation 'javax.persistence:javax.persistence-api:2.2' | ||
testImplementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' | ||
testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') | ||
testImplementation group: 'com.google.guava', name: 'guava', version: '31.1-jre' | ||
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0' | ||
|
@@ -194,7 +214,11 @@ jar { | |
archivesBaseName = 'pw-iso20022' | ||
subprojects.each { subproject -> | ||
from subproject.configurations.archives.allArtifacts.files.collect { | ||
zipTree(it) | ||
// filter out any artifacts that are not jars | ||
if (it.name.endsWith('.jar')) { | ||
println "Adding ${it.name} to fat jar" | ||
zipTree(it) | ||
} | ||
} | ||
} | ||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
|
@@ -313,9 +337,22 @@ artifacts { | |
// declared dependencies for pom generation | ||
dependencies { | ||
// included build (keep in sync with the latest Prowide Core version) | ||
api 'com.prowidesoftware:pw-swift-core:SRU2023-9.4.16' | ||
implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
implementation 'com.google.code.gson:gson:2.9.0' | ||
|
||
api 'com.prowidesoftware:pw-swift-core:SRU2023-10.1.15' | ||
|
||
// included transitive dependencies from Prowide Core | ||
//implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
//implementation 'com.google.code.gson:gson:2.9.0' | ||
|
||
// jaxb is required because it is no longer included in the JDK | ||
implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
// bind-api is included transitively by jaxb-impl | ||
// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
} | ||
|
||
project.ext { | ||
// publishing repository | ||
nexusRepo = project.version.endsWith('-SNAPSHOT') ? 'maven-snapshots' : 'maven-releases' | ||
} | ||
|
||
// repo for publishing | ||
|
@@ -452,7 +489,7 @@ tasks.register('bundle', Jar) { | |
from ("$buildDir/libs") { | ||
include '*.asc' | ||
} | ||
archiveName 'bundle.jar' | ||
archiveFileName.set('bundle.jar') | ||
} | ||
|
||
tasks.withType(Test) { | ||
|
@@ -461,15 +498,15 @@ tasks.withType(Test) { | |
} | ||
} | ||
|
||
task('testOn11', type: Test) { | ||
task('testOn17', type: Test) { | ||
javaLauncher = javaToolchains.launcherFor { | ||
languageVersion = JavaLanguageVersion.of(11) | ||
languageVersion = JavaLanguageVersion.of(17) | ||
} | ||
} | ||
|
||
task('testOn17', type: Test) { | ||
task('testOn19', type: Test) { | ||
javaLauncher = javaToolchains.launcherFor { | ||
languageVersion = JavaLanguageVersion.of(17) | ||
languageVersion = JavaLanguageVersion.of(19) | ||
} | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
networkTimeout=10000 | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Incorrect heading level.
The heading level should increment by one level at a time. Change the heading level from
####
to###
.Committable suggestion
Tools
Markdownlint