From 8d287e3a305dcd64cfff074da515d42d325820b4 Mon Sep 17 00:00:00 2001 From: Johannes Visintini Date: Wed, 7 Feb 2024 13:03:06 +0100 Subject: [PATCH] Change references of master branch to main (#522) --- .github/PULL_REQUEST_TEMPLATE.md | 6 +++--- CHANGELOG.md | 4 ++-- Jenkinsfile | 4 ++-- README.md | 2 +- .../heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java | 4 ++-- .../org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java | 4 ++-- .../ohsome/oshdb/api/mapreducer/MapReducerSettings.java | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cca08dd36..bc82e713b 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/oshdb/blob/master/CONTRIBUTING.md) rules, and I have checked on the [static analyses](https://jenkins.ohsome.org/job/oshdb/view/change-requests/) and [benchmark](https://reports.ohsome.org/oshdb-benchmarks/) (if applicable) results +- [ ] My code follows the [code-style](https://github.com/GIScience/oshdb/blob/main/CONTRIBUTING.md) rules, and I have checked on the [static analyses](https://jenkins.ohsome.org/job/oshdb/view/change-requests/) and [benchmark](https://reports.ohsome.org/oshdb-benchmarks/) (if applicable) results - [ ] I have commented my code - [ ] I have written javadoc (required for public classes and methods) - [ ] I have added sufficient unit tests -- [ ] I have made corresponding changes to the [documentation](https://github.com/GIScience/oshdb/tree/master/documentation) -- [ ] I have updated the [CHANGELOG.md](https://github.com/GIScience/oshdb/blob/master/CHANGELOG.md) +- [ ] I have made corresponding changes to the [documentation](https://github.com/GIScience/oshdb/tree/main/documentation) +- [ ] I have updated the [CHANGELOG.md](https://github.com/GIScience/oshdb/blob/main/CHANGELOG.md) - [ ] I have adjusted the [examples](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples) or [created an issue](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples/-/issues/new) in the corresponding repository - [ ] I have adjusted the [benchmark](https://reports.ohsome.org/oshdb-benchmarks/) or [created an issue](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-benchmarks/-/issues/new) in the corresponding repository diff --git a/CHANGELOG.md b/CHANGELOG.md index a35f2fe81..404180cf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -## 1.3.0-SNAPSHOT (current master) +## 1.3.0-SNAPSHOT (current main) ## 1.2.1 @@ -453,7 +453,7 @@ When switching to the OSHDB version 0.6 you need to adapt your `pom.xml` to the * Source code is now released as open-source under _GNU Lesser General Public License version 3_. * Dependencies are updated and reduced to the minimum. Also, they are now declared in the modules where needed instead of the top level. You might therefore have to declare dependencies of your code explicitly when upgrading. ([#79], [#5]) * Drop most deprecated methods from OSHDB version 0.4.0 -* More [examples and documentation](https://github.com/GIScience/oshdb/tree/master/documentation) are available. +* More [examples and documentation](https://github.com/GIScience/oshdb/tree/main/documentation) are available. * Many small bugfixes and improvements, especially for the Ignite-backend. Ignite can now be considered stable and used to analyze a global data set. * oshdb-api: renamed some methods (`where` filter → `osmTag` and `osmEntityFilter`, `osmTypes` filter → `osmType`) and refactored some methods to accept a wider range of input objects. * `GeometryCollection` geometries are no longer ignored when calculating lengths or areas of features. ([#51]) diff --git a/Jenkinsfile b/Jenkinsfile index ee0d65d79..818257dd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,8 +12,8 @@ pipeline { environment { // this regex determines which branch is deployed as a snapshot // START CUSTOM oshdb - SNAPSHOT_BRANCH_REGEX = /(^master$)/ - BENCHMARK_BRANCH_REGEX = /(^master$)/ + SNAPSHOT_BRANCH_REGEX = /(^main$)/ + BENCHMARK_BRANCH_REGEX = /(^main$)/ // END CUSTOM oshdb RELEASE_REGEX = /^([0-9]+(\.[0-9]+)*)(-(RC|beta-|alpha-)[0-9]+)?$/ RELEASE_DEPLOY = false diff --git a/README.md b/README.md index 685fded4f..160d106c5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ High-performance spatio-temporal data analysis platform for OpenStreetMap full-h HeiGIT Logo -[![Build Status](https://jenkins.heigit.org/buildStatus/icon?job=oshdb/master)](https://jenkins.heigit.org/job/oshdb/job/master/) +[![Build Status](https://jenkins.heigit.org/buildStatus/icon?job=oshdb/main)](https://jenkins.heigit.org/job/oshdb/job/main/) [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=org.heigit.ohsome:oshdb&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.heigit.ohsome:oshdb) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.heigit.ohsome/oshdb/badge.svg)](https://search.maven.org/artifact/org.heigit.ohsome/oshdb) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4146990.svg)](https://doi.org/10.5281/zenodo.4146990) diff --git a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java index 7627f98b1..5ec4a97ca 100644 --- a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java +++ b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java @@ -776,7 +776,7 @@ public MapAggregator filter(SerializablePredicate f) { /** * Apply a custom filter expression to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme and {@link org.heigit.ohsome.oshdb.filter} for further information about how * to create such a filter expression object. * @@ -792,7 +792,7 @@ public MapAggregator filter(FilterExpression f) { /** * Apply a textual filter to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme for a description of the filter syntax. * * @param f the filter string to apply diff --git a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java index 58e69fe16..aaacb111c 100644 --- a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java +++ b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducer.java @@ -485,7 +485,7 @@ public MapReducer filter(SerializablePredicate f) { /** * Apply a custom filter expression to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme and {@link org.heigit.ohsome.oshdb.filter} for further information about how * to create such a filter expression object. * @@ -544,7 +544,7 @@ public MapReducer filter(FilterExpression f) { /** * Apply a textual filter to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme for a description of the filter syntax. * * @param f the filter string to apply diff --git a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducerSettings.java b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducerSettings.java index a630da21d..e52fe30d9 100644 --- a/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducerSettings.java +++ b/oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapReducerSettings.java @@ -38,7 +38,7 @@ interface MapReducerSettings { /** * Apply a textual filter to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme for a description of the filter syntax. * * @param f the filter string to apply @@ -50,7 +50,7 @@ interface MapReducerSettings { /** * Apply a custom filter expression to this query. * - * @see oshdb-filter + * @see oshdb-filter * readme and {@link org.heigit.ohsome.oshdb.filter} for further information about how * to create such a filter expression object. *