Skip to content

Commit

Permalink
Change references of master branch to main (#522)
Browse files Browse the repository at this point in the history
  • Loading branch information
joker234 authored Feb 7, 2024
1 parent fcba2cf commit 8d287e3
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

## 1.3.0-SNAPSHOT (current master)
## 1.3.0-SNAPSHOT (current main)


## 1.2.1
Expand Down Expand Up @@ -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])
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ High-performance spatio-temporal data analysis platform for OpenStreetMap full-h

<img src="https://heigit.org/wp-content/uploads/2018/01/[email protected]" height="80px" width="404px" alt="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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ public MapAggregator<U, X> filter(SerializablePredicate<X> f) {
/**
* Apply a custom filter expression to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#readme">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#readme">oshdb-filter
* readme</a> and {@link org.heigit.ohsome.oshdb.filter} for further information about how
* to create such a filter expression object.
*
Expand All @@ -792,7 +792,7 @@ public MapAggregator<U, X> filter(FilterExpression f) {
/**
* Apply a textual filter to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#syntax">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#syntax">oshdb-filter
* readme</a> for a description of the filter syntax.
*
* @param f the filter string to apply
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ public MapReducer<X> filter(SerializablePredicate<X> f) {
/**
* Apply a custom filter expression to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#readme">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#readme">oshdb-filter
* readme</a> and {@link org.heigit.ohsome.oshdb.filter} for further information about how
* to create such a filter expression object.
*
Expand Down Expand Up @@ -544,7 +544,7 @@ public MapReducer<X> filter(FilterExpression f) {
/**
* Apply a textual filter to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#syntax">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#syntax">oshdb-filter
* readme</a> for a description of the filter syntax.
*
* @param f the filter string to apply
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ interface MapReducerSettings<M> {
/**
* Apply a textual filter to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#syntax">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#syntax">oshdb-filter
* readme</a> for a description of the filter syntax.
*
* @param f the filter string to apply
Expand All @@ -50,7 +50,7 @@ interface MapReducerSettings<M> {
/**
* Apply a custom filter expression to this query.
*
* @see <a href="https://github.com/GIScience/oshdb/tree/master/oshdb-filter#readme">oshdb-filter
* @see <a href="https://github.com/GIScience/oshdb/tree/main/oshdb-filter#readme">oshdb-filter
* readme</a> and {@link org.heigit.ohsome.oshdb.filter} for further information about how
* to create such a filter expression object.
*
Expand Down

0 comments on commit 8d287e3

Please sign in to comment.