Skip to content

Commit d8b6649

Browse files
meonkeysmeonkeys
committed
Merge branch 'release/1.14.0' into develop
* release/1.14.0: update manual release instructions port steps 10 & 11 to the ATR docs: adapt artifact checks to new ATR tool improve svn release staging/release instructions exclude jquery-1.7.min.js from source release ignore .swp files when building src release add license to .mailmap add RAT excludes for ATR add license to scripts/*.sh fix both NOTICE files for ATR doc: remove errant config improve start release notes wording in step 3
2 parents 5f40037 + 9977fb3 commit d8b6649

26 files changed

+197
-259
lines changed

‎.atr-rat-excludes-bin.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# See comment below license in .atr-rat-excludes-src.txt for an explanation of
19+
# what this is.
20+
21+
# if you make changes here, sort this list before committing asciibetically
22+
# with en_US.UTF-8 lang/locale
23+
.rat-excludes
24+
README.md
25+
fineract-documentation.pdf
26+
27+
# vim:ft=conf

‎.atr-rat-excludes-src.txt‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# Path patterns to exclude from RAT checks run by ATR.
19+
#
20+
# RAT = Release Audit Tool (https://creadur.apache.org/rat/)
21+
# ATR = ASF Trusted Releases (https://release-test.apache.org , https://github.com/apache/tooling-trusted-releases/)
22+
#
23+
# This duplicates exclusions in build.gradle.
24+
# This is probably only necessary until both RAT and org.nosphere.apache.rat plugin are using 0.17.
25+
# See https://github.com/eskatos/creadur-rat-gradle/issues/28 .
26+
# Once both are on 0.17, we should be able to move the RAT excludes used during
27+
# the build from build.gradle into a .rat-excludes file shared by both our
28+
# build and ATR.
29+
# Right now ATR does something custom, see
30+
# https://github.com/apache/tooling-trusted-releases/issues/312 .
31+
# If we get tired of waiting for the RAT gradle plugin or the ATR to upgrade to
32+
# 0.17, we could write our own exclusion lists generator.
33+
34+
# if you make changes here, sort this list before committing asciibetically
35+
# with en_US.UTF-8 lang/locale
36+
**/META-INF/fineract-test.config
37+
**/legacy-docs/
38+
*.adoc
39+
*.avsc
40+
*.feature
41+
*.html
42+
*.md
43+
*.mustache
44+
*.puml
45+
*.txt
46+
.openapi-generator-ignore
47+
/.asf.yaml
48+
/.rat-excludes
49+
/config/fineractdev-eclipse-preferences.epf
50+
/fineract-provider/src/test/resources/results/xbrl.xml
51+
/gradle/wrapper/gradle-wrapper.properties
52+
org.springframework.boot.autoconfigure.AutoConfiguration.imports
53+
54+
# vim:ft=conf

‎.mailmap‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
118
# .mailmap unifies differences in commit names and emails, and shortens committers' names.
219
# .mailmap format is a bit weird, e.g. https://github.com/sympy/sympy/wiki/Using-.mailmap explains it.
320
# .mailmap official doc is on https://git-scm.com/docs/git-shortlog#_mapping_authors

‎NOTICE_RELEASE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Apache Fineract
22
Copyright 2008-2025 The Apache Software Foundation
33

4-
This product includes software developed by The Apache Software
5-
Foundation (http://www.apache.org/).
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).
66

77
This product includes third party libraries and resource files from
88
different providers. The details of the different packages and their

‎NOTICE_SOURCE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Fineract
22
Copyright 2008-2025 The Apache Software Foundation
33

4-
This product includes software developed by The Apache Software
5-
Foundation (http://www.apache.org/).
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).

‎build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,7 @@ allprojects {
353353
"**/generated/**/*MapperImpl.java",
354354
'**/META-INF/fineract-test.config',
355355
// Apache-specific GitHub metadata settings file
356-
'/.asf.yaml',
357-
'**/*.sh'
356+
'/.asf.yaml'
358357
]
359358
}
360359
}

‎buildSrc/src/main/groovy/org.apache.fineract.release.gradle‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -196,36 +196,10 @@ fineract {
196196
step10: [
197197
order: 10,
198198
description: 'Start voting on the dev mailing list',
199-
email: [
200-
from: "${findProperty('fineract.config.email')}",
201-
name: "${findProperty('fineract.config.name')}",
202-
to: "${findProperty('fineract.config.email')}",
203-
// to: '[email protected]',
204-
mime: 'text/plain',
205-
subjectTemplate: [
206-
templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step10.vote.subject.ftl"
207-
],
208-
messageTemplate: [
209-
templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step10.vote.message.ftl"
210-
]
211-
]
212199
],
213200
step11: [
214201
order: 11,
215202
description: 'Conclude the vote and announce results',
216-
email: [
217-
from: "${findProperty('fineract.config.email')}",
218-
name: "${findProperty('fineract.config.name')}",
219-
to: "${findProperty('fineract.config.email')}",
220-
// to: '[email protected]',
221-
mime: 'text/plain',
222-
subjectTemplate: [
223-
templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step11.vote.subject.ftl"
224-
],
225-
messageTemplate: [
226-
templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step11.vote.message.ftl"
227-
]
228-
]
229203
],
230204
step12: [
231205
order: 12,

‎buildSrc/src/main/groovy/org/apache/fineract/gradle/FineractPlugin.groovy‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.fineract.gradle
2020

21-
import groovy.json.JsonSlurper
2221
import org.apache.commons.io.FileUtils
2322
import org.apache.commons.io.filefilter.NotFileFilter
2423
import org.apache.commons.io.filefilter.PrefixFileFilter
@@ -384,23 +383,7 @@ class FineractPlugin implements Plugin<Project> {
384383
doFirst {
385384
FineractPluginExtension.FineractPluginStep step = step(extension, "step10")
386385

387-
String version = project.properties?['fineract.release.version']
388-
389-
if(!version) {
390-
TextIO textIO = TextIoFactory.getTextIO();
391-
392-
version = textIO.newStringInputReader()
393-
.withPattern("\\d+.\\d+.\\d+")
394-
.read("Release Version");
395-
}
396-
397-
// TODO: input validation, see FINERACT-1610
398-
399-
this.context?.project?['fineract.release.version'] = version
400-
401-
if(step.email) {
402-
emailService.send( processEmailParams(step.email, this.context) )
403-
}
386+
printInstructions(project, "step10")
404387
}
405388
}
406389

@@ -409,28 +392,7 @@ class FineractPlugin implements Plugin<Project> {
409392
doFirst {
410393
FineractPluginExtension.FineractPluginStep step = step(extension, "step11")
411394

412-
String version = project.properties?['fineract.release.version']
413-
414-
if(!version) {
415-
TextIO textIO = TextIoFactory.getTextIO()
416-
417-
version = textIO.newStringInputReader()
418-
.withPattern("\\d+.\\d+.\\d+")
419-
.read("Release Version");
420-
}
421-
422-
// TODO: input validation, see FINERACT-1610
423-
424-
this.context?.project?['fineract.release.version'] = version
425-
426-
def jsonSlurper = new JsonSlurper()
427-
def data = jsonSlurper.parse(new File("buildSrc/src/main/resources/vote/result.${version}.json"))
428-
429-
this.context?.project?['fineract.vote'] = data
430-
431-
if(step.email) {
432-
emailService.send( processEmailParams(step.email, this.context) )
433-
}
395+
printInstructions(project, "step11")
434396
}
435397
}
436398

‎buildSrc/src/main/resources/email/release.step10.vote.message.ftl‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎buildSrc/src/main/resources/email/release.step11.vote.message.ftl‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)