Skip to content

Commit a804849

Browse files
authored
Merge pull request #5726
FINERACT-2574: improve release LICENSE language
2 parents 39e5d52 + 3ba5dc5 commit a804849

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

LICENSE_RELEASE

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,18 @@
208208
======================================
209209

210210
All the source code for the Apache Fineract project is released under the
211-
license above. Additionally, the Apache Fineract source and binary
212-
distribution includes a number of third-party files that are required in
213-
order to the software to function. Unless noted below, these jars
214-
and resource files are also released under the ASF license above.
211+
license above. Additionally, the Apache Fineract source and binary distribution
212+
includes a number of third-party files that are required in order to the
213+
software to function. Unless noted below, these jars and resource files are
214+
also released under the Apache License, Version 2.0.
215215

216216
==================================================
217217
*The exceptions for binary release are as follows:
218218
==================================================
219219

220-
This product bundles third party jars and resource files that are
221-
released under other licenses than the ASF license. You can find
222-
details of all third party licenses in the directory "licenses".
220+
This product bundles third party jars and resource files that are released
221+
under licenses other than the Apache License, Version 2.0 following the ASF 3rd
222+
party license policy. You can find details of all third party licenses in the
223+
"licenses" directory (if the "generateLicenseReport" Gradle task has been run).
223224

224225
******************************************

LICENSE_SOURCE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@
208208
======================================
209209

210210
All the source code for the Apache Fineract project is released under the
211-
license above. Additionally, the Apache Fineract source and binary
212-
distribution includes a number of third-party files that are required in
213-
order to the software to function. Unless noted below, these jars
214-
and resource files are also released under the ASF license above.
211+
license above. Additionally, the Apache Fineract source and binary distribution
212+
includes a number of third-party files that are required in order to the
213+
software to function. Unless noted below, these jars and resource files are
214+
also released under the Apache License, Version 2.0.
215215

216216
==================================================
217217
*The exceptions for source release are as follows:

fineract-doc/src/docs/en/chapters/release/process-step06.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Create source and binary tarballs.
66

77
[source,bash,subs="attributes+"]
88
----
9-
./gradlew clean srcDistTar binaryDistTar
9+
./gradlew clean
10+
./gradlew generateLicenseReport
11+
./gradlew srcDistTar binaryDistTar
1012
----
1113

1214
Check that `fineract-provider/build/classes/java/main/git.properties` exists. If so, continue. If not, you're likely encountering https://github.com/n0mer/gradle-git-properties/issues/233[this bug], and you need to *re-run the command above* to create proper source and binary tarballs. That `git.properties` file is supposed to end up at `BOOT-INF/classes/git.properties` in `fineract-provider-{revnumber}.jar` in the binary release tarball. Its contents are displayed at the `/fineract-provider/actuator/info` endpoint. It may be possible to fix this heisenbug entirely by https://github.com/gradle/gradle/issues/34177#issuecomment-3051970053[modifying our git properties gradle plugin config] in `fineract-provider/build.gradle`, perhaps by changing where `git.properties` is written.

0 commit comments

Comments
 (0)