Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename main branch to 'main' #524

Merged
merged 1 commit into from
Apr 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build & publish docs
on:
push:
branches:
- master
- main

env:
SITE_DIR: 'site'
Expand Down Expand Up @@ -46,4 +46,4 @@ jobs:
FOLDER: "${{ env.SITE_DIR }}"
BRANCH: 'gh-pages'
COMMIT_MESSAGE: "[CI] Publish Documentation for ${{ github.sha }}"
CLEAN: true
CLEAN: true
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand Down Expand Up @@ -36,4 +36,4 @@ jobs:
key: ${{ runner.os }}-mvn-cache-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-mvn-cache-
- name: Build
run: ./mvnw -B -V -Prun-its clean verify
run: ./mvnw -B -V -Prun-its clean verify
5 changes: 3 additions & 2 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ifndef::icons[]
endif::[]

This document provides a high-level view of the changes introduced on Asciidoctor Maven Plugin by release.
For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
For a detailed view of what has changed, refer to the {uri-repo}/commits/main[commit history] on GitHub.

== Unreleased

Expand All @@ -18,7 +18,7 @@ Documentation::
* Migrate docs (README) to Antora site and publish them in gh-pages (#498)
* Remove ambiguity in usage of maven properties docs (#507)
* Add ID to 'attributes' description, to be able to generate direct url from other docs (#509)
* Fix broken links to extension api documentation (#523).
* Fix broken links to extension api documentation (https://github.com/djarnis73[@djarnis73]) (#523)

Maintenance::

Expand All @@ -30,6 +30,7 @@ Maintenance::
* Rewrite `AsciidoctorZipMojoTest` to Java to make it more approachable (#518)
* Rewrite `AsciidoctorDoxiaParserTest` to Java + remove Groovy & Spock configurations (#519)
* Upgrade tests to JUni5 (#521)
* Rename main branch (#524)

== v2.1.0 (2020-09-15)

Expand Down
12 changes: 6 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ ifndef::env-github[:icons: font]
:uri-asciidoctor: http://asciidoctor.org
:uri-examples: https://github.com/asciidoctor/asciidoctor-maven-examples
:uri-maven: http://maven.apache.org
:uri-license: {uri-repo}/blob/master/LICENSE.txt
:uri-license: {uri-repo}/blob/main/LICENSE.txt
:uri-docs: https://asciidoctor.github.io/asciidoctor-maven-plugin/maven-tools/{docs-version}
// GitHub customization
ifdef::env-github[]
:badges:
:tag: master
:tag: main
:!toc-title:
:tip-caption: :bulb:
:note-caption: :paperclip:
Expand All @@ -33,10 +33,10 @@ endif::[]

// Badges
ifdef::badges[]
image:https://ci.appveyor.com/api/projects/status/chebmu91f08dlmsc/branch/master?svg=true["Build Status (AppVeyor)", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/travis/asciidoctor/asciidoctor-maven-plugin/master.svg["Build Status (Travis CI)", link="https://travis-ci.org/asciidoctor/asciidoctor-maven-plugin"]
image:https://ci.appveyor.com/api/projects/status/chebmu91f08dlmsc/branch/main?svg=true["Build Status (AppVeyor)", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/travis/asciidoctor/asciidoctor-maven-plugin/main.svg["Build Status (Travis CI)", link="https://travis-ci.org/asciidoctor/asciidoctor-maven-plugin"]
image:{uri-repo}/workflows/Build/badge.svg[Build Status,link={uri-repo}/actions]
image:http://img.shields.io/coveralls/{project-repo}/master.svg["Coverage Status", link="https://coveralls.io/r/{project-repo}?branch=master"]
image:http://img.shields.io/coveralls/{project-repo}/main.svg["Coverage Status", link="https://coveralls.io/r/{project-repo}?branch=main"]
image:https://maven-badges.herokuapp.com/maven-central/org.asciidoctor/asciidoctor-maven-plugin/badge.svg["Maven Central",link="https://maven-badges.herokuapp.com/maven-central/org.asciidoctor/asciidoctor-maven-plugin"]
image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
endif::[]
Expand All @@ -57,7 +57,7 @@ ifndef::env-site[]
* link:README_zh-CN.adoc[汉语]
endif::[]

ifeval::['{tag}' == 'master']
ifeval::['{tag}' == 'main']
[NOTE]
====
You're viewing the documentation for the upcoming release.
Expand Down
8 changes: 4 additions & 4 deletions README_zh-CN.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ifdef::env-github[:badges:]
:uri-maven: http://maven.apache.org
// GitHub customization
ifdef::env-github[]
:tag: master
:tag: main
:!toc-title:
:tip-caption: :bulb:
:note-caption: :paperclip:
Expand All @@ -27,9 +27,9 @@ ifdef::env-github[]
endif::[]
// Badges
ifdef::badges[]
image:https://ci.appveyor.com/api/projects/status/chebmu91f08dlmsc/branch/master?svg=true["Build Status (AppVeyor)", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/travis/asciidoctor/asciidoctor-maven-plugin/master.svg["Build Status (Travis CI)", link="https://travis-ci.org/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/coveralls/{project-repo}/master.svg["Coverage Status", link="https://coveralls.io/r/{project-repo}?branch=master"]
image:https://ci.appveyor.com/api/projects/status/chebmu91f08dlmsc/branch/main?svg=true["Build Status (AppVeyor)", link="https://ci.appveyor.com/project/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/travis/asciidoctor/asciidoctor-maven-plugin/main.svg["Build Status (Travis CI)", link="https://travis-ci.org/asciidoctor/asciidoctor-maven-plugin"]
image:http://img.shields.io/coveralls/{project-repo}/main.svg["Coverage Status", link="https://coveralls.io/r/{project-repo}?branch=main"]
image:https://maven-badges.herokuapp.com/maven-central/org.asciidoctor/asciidoctor-maven-plugin/badge.svg["Maven Central",link="https://maven-badges.herokuapp.com/maven-central/org.asciidoctor/asciidoctor-maven-plugin"]
endif::[]

Expand Down
6 changes: 3 additions & 3 deletions antora-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ site:
content:
sources:
- url: .
branches: [ master ]
branches: [ main ]
start_path: docs
asciidoc:
attributes:
Expand All @@ -12,10 +12,10 @@ asciidoc:
idseparator: '-'
ui:
bundle:
url: https://github.com/abelsromero/asciidoctor-maven-plugin-antora-ui/raw/master/bundle/ui-bundle.zip
url: https://github.com/abelsromero/asciidoctor-maven-plugin-antora-ui/raw/main/bundle/ui-bundle.zip
snapshot: true
supplemental_files:
- path: ui.yml
contents: |
static_files: [ .nojekyll ]
- path: .nojekyll
- path: .nojekyll
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ When a custom value is set, no other paths are checked.
====
All paths and AsciiDoc documents that start with `pass:[_]` are considered _internal_ and are skipped.
That is, AsciiDocs are not converted and resources are not copied from them, but you can include them normally from other AsciiDocs. +
This is useful to split your sources in sets of master documents and included parts.
This is useful to split your sources in sets of main documents and included parts.
====

sourceDocumentName:: an override to process a single source file; defaults to all files in [.path]`$\{sourceDirectory}`.
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/project/pages/copyright-and-licence.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
== Copyright and License
:uri-license: https://github.com/asciidoctor/asciidoctor-maven-plugin/blob/master/LICENSE.txt
:uri-license: https://github.com/asciidoctor/asciidoctor-maven-plugin/blob/main/LICENSE.txt

Copyright (C) 2013-2020 Jason Porter, Dan Allen, Abel Salgado Romero and the individual contributors.
Use of this software is granted under the terms of the Apache License, Version 2.0.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Specific tests to validate usage of AsciidoctorJ extension in AsciidoctorMojo.
*
* Most of the examples have been directly adapted from the ones found in AsciidoctorJ
* documentation (https://github.com/asciidoctor/asciidoctorj/blob/master/README.adoc)
* documentation.
*
* @author abelsromero
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include::unexistingdoc.adoc[]

include::unexistingdoc.adoc[]

include::https://raw.githubusercontent.com/asciidoctor/asciidoctor-maven-plugin/master/src/test/resources/src/asciidoctor/github-include.adoc[]
include::https://raw.githubusercontent.com/asciidoctor/asciidoctor-maven-plugin/main/src/test/resources/src/asciidoctor/github-include.adoc[]

include::unexistingdoc.adoc[]

Expand All @@ -22,4 +22,4 @@ public class HelloWorld {

}
----
<1> Missing callout reference?
<1> Missing callout reference?
2 changes: 1 addition & 1 deletion src/test/resources/src/asciidoctor/processors-sample.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ The time is now. Get a move on.
include::https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/Gemfile[]
----

Created by {author}
Created by {author}