Skip to content

Commit 3efa884

Browse files
Merge origin/main into renovate/apache.commons.lang.version
2 parents f25ec97 + 69088ac commit 3efa884

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ Detailed build and testing instructions can be found in [BUILDANDTEST.md](./BUIL
4646

4747
Troubleshooting: If you run into issues, please open an [issue](https://github.com/finos/rune-python-generator/issues). This helps us improve the guide for everyone.
4848

49+
### Coding Standards
50+
51+
- Indentation: Since Python is sensitive to indentation, ensure your submission uses four spaces for each indentation instead of tabs.
52+
- Java vs xTend: since the intention is to replace xTend, all new code should be written in Java. Ideally, changes to existing code will migrate xTend code to Java.
53+
4954
### 1. Building with Maven
5055

5156
Start by cloning the project: `git clone https://github.com/finos/rune-python-generator`
@@ -109,7 +114,9 @@ We welcome contributions! Please follow these steps to get started:
109114
3. Read our [contribution guidelines](.github/CONTRIBUTING.md) and [Community Code of Conduct](https://www.finos.org/code-of-conduct)
110115
4. Commit your changes (`git commit -am 'Add some fooBar'`)
111116
5. Push to the branch (`git push origin feature/fooBar`)
112-
6. Create a new Pull Request
117+
6. Create a new Pull Request: the intention is to ensure that Main is always production ready and matches a release.
118+
- Simple / short running changes : the PR should be to Main
119+
- Complex / long running changes: the recommendation is to complete all the changes in a staging branch, such as Develop or another branch of your choosing. Once the change is complete and passes all tests, then raise the PR to main from your staging branch.
113120

114121
**NOTE: FINOS repositories require an executed and active FINOS Individual Contributor License Agreement (ICLA) or an executed and active FINOS Corporate Contribution License Agreement (CCLA). The FINOS Clabot tool (or EasyCLA) will flag and block commits from individuals not covered. Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA.**
115122

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<repoServerHost>s01.oss.sonatype.org</repoServerHost>
8282
<stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
8383

84-
<rosetta.dsl.version>9.70.0</rosetta.dsl.version>
84+
<rosetta.dsl.version>9.71.0</rosetta.dsl.version>
8585

8686
<xtext.version>2.38.0</xtext.version>
8787
<guice.version>6.0.0</guice.version>

0 commit comments

Comments
 (0)