From c40abadacf03721a17f47f8fe1806d502346c6d1 Mon Sep 17 00:00:00 2001 From: Johannes Visintini Date: Wed, 7 Feb 2024 13:03:18 +0100 Subject: [PATCH] Change references of master branch to main (#321) --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++---- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- Jenkinsfile | 2 +- README.md | 6 +++--- docs/filter.rst | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 87befdfe7..058fc2b67 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,12 +10,12 @@ Closes # - ### Checklist -- [ ] My code follows the [code-style](https://github.com/GIScience/ohsome-api/blob/master/CONTRIBUTING.md#code-style) rules, and I have checked on the [static analyses](https://jenkins.ohsome.org/job/ohsome-api/view/change-requests/) +- [ ] My code follows the [code-style](https://github.com/GIScience/ohsome-api/blob/main/CONTRIBUTING.md#code-style) rules, and I have checked on the [static analyses](https://jenkins.ohsome.org/job/ohsome-api/view/change-requests/) - [ ] I have commented my code - [ ] I have written javadoc (required for public methods) - [ ] I have added sufficient unit and API tests -- [ ] I have made corresponding changes to the [documentation](https://github.com/GIScience/ohsome-api/tree/master/docs) -- [ ] I have updated the [CHANGELOG.md](https://github.com/GIScience/ohsome-api/blob/master/CHANGELOG.md) -- [ ] I have adjusted the examples in the [check-ohsome-api](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/helpers/check-ohsome-api) script or [created an issue](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/helpers/check-ohsome-api/-/issues/new) in the corresponding repository. More Information [here](https://github.com/GIScience/ohsome-api/blob/master/CONTRIBUTING.md#check-examples). +- [ ] I have made corresponding changes to the [documentation](https://github.com/GIScience/ohsome-api/tree/main/docs) +- [ ] I have updated the [CHANGELOG.md](https://github.com/GIScience/ohsome-api/blob/main/CHANGELOG.md) +- [ ] I have adjusted the examples in the [check-ohsome-api](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/helpers/check-ohsome-api) script or [created an issue](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/helpers/check-ohsome-api/-/issues/new) in the corresponding repository. More Information [here](https://github.com/GIScience/ohsome-api/blob/main/CONTRIBUTING.md#check-examples). Please check all finished tasks. If some tasks do not apply to your PR, please cross their text out (by using `~...~`) and remove their checkboxes. diff --git a/CHANGELOG.md b/CHANGELOG.md index f53b95e8b..c5dce5d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -## 1.11.0-SNAPSHOT (current master) +## 1.11.0-SNAPSHOT (current main) ### Bug Fixes * Fix spaces from being removed from parameters like `groupByValues` ([#305]) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a754add1..7b3c31381 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Code Style -We're using the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) for the source code. With the [exception](https://google.github.io/styleguide/javaguide.html#s5.3-camel-case) that the abbreviations `OSM`, `OSH` and `OSHDB` are allowed to be used in method and class names. For some popular IDEs and code linting tools you can find configuration files of the used code style in the OSHDB repository: [config/ide](https://github.com/GIScience/oshdb/tree/master/config/ide). +We're using the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) for the source code. With the [exception](https://google.github.io/styleguide/javaguide.html#s5.3-camel-case) that the abbreviations `OSM`, `OSH` and `OSHDB` are allowed to be used in method and class names. For some popular IDEs and code linting tools you can find configuration files of the used code style in the OSHDB repository: [config/ide](https://github.com/GIScience/oshdb/tree/main/config/ide). # Check Examples diff --git a/Jenkinsfile b/Jenkinsfile index 1ae8a9ff2..34d73cb73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { MAVEN_TEST_OPTIONS = '-Dport_get=8081 -Dport_post=8082 -Dport_data=8083 -DdbFilePathProperty=--database.db=/data/heidelberg-v1.0-beta.oshdb' // END CUSTOM ohsome API // this regex determines which branch is deployed as a snapshot - SNAPSHOT_BRANCH_REGEX = /(^master$)/ + SNAPSHOT_BRANCH_REGEX = /(^main$)/ RELEASE_REGEX = /^([0-9]+(\.[0-9]+)*)(-(RC|beta-|alpha-)[0-9]+)?$/ RELEASE_DEPLOY = false SNAPSHOT_DEPLOY = false diff --git a/README.md b/README.md index 068fd51cc..b921c6017 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ohsome API -[![Build Status](https://jenkins.heigit.org/buildStatus/icon?job=ohsome%20api/master)](https://jenkins.heigit.org/job/ohsome%20api/job/master/) +[![Build Status](https://jenkins.heigit.org/buildStatus/icon?job=ohsome%20api/main)](https://jenkins.heigit.org/job/ohsome%20api/job/main/) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=org.heigit.ohsome:ohsome-api&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.heigit.ohsome:ohsome-api) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.heigit.ohsome/ohsome-api/badge.svg)](https://search.maven.org/artifact/org.heigit.ohsome/ohsome-api) [![LICENSE](https://img.shields.io/github/license/GIScience/ohsome-api)](LICENSE) @@ -104,11 +104,11 @@ These instructions will get you a copy of the project up and running on your loc * [Java 17](https://openjdk.java.net/projects/jdk/17/) or higher * [Apache Maven 3.5](https://maven.apache.org/download.cgi) or higher -* data: [download](https://downloads.ohsome.org/OSHDB/) it directly, or work through a guide on [how to prepare a new OSHDB extract](https://github.com/GIScience/oshdb/blob/master/oshdb-etl/README.md) +* data: [download](https://downloads.ohsome.org/OSHDB/) it directly, or work through a guide on [how to prepare a new OSHDB extract](https://github.com/GIScience/oshdb/blob/main/oshdb-etl/README.md) ### IDE Settings -* [Code style](/CONTRIBUTING.md#code-style): For some popular IDEs and code linting tools you can find configuration files of the used code style in the OSHDB repository: [config/ide](https://github.com/GIScience/oshdb/tree/master/config/ide). +* [Code style](/CONTRIBUTING.md#code-style): For some popular IDEs and code linting tools you can find configuration files of the used code style in the OSHDB repository: [config/ide](https://github.com/GIScience/oshdb/tree/main/config/ide). * [Lombok](https://projectlombok.org/): Please check the [setup instructions](https://projectlombok.org/setup/overview) for your IDE. * In some cases you have to mark some directories manually by their type: * `src/main/lombok` as a _source_ directory, diff --git a/docs/filter.rst b/docs/filter.rst index 25be1f6ce..dbdddd81b 100644 --- a/docs/filter.rst +++ b/docs/filter.rst @@ -225,4 +225,4 @@ Further Information ------------------- The filter parameter is powered by a separate Java module, which can be used independently as a maven library. -You can find further information in the `Readme of the *oshdb-filter* module `_. +You can find further information in the `Readme of the *oshdb-filter* module `_.