From 5b61858f853c68b67af305d641674ff73d4c2bae Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Nov 2023 15:17:45 +0100 Subject: [PATCH] Include Spring Data commons tags and branches in Antora build. --- playbooks/cassandra.yml | 3 ++- playbooks/couchbase.yml | 3 ++- playbooks/elasticsearch.yml | 3 ++- playbooks/jpa.yml | 3 ++- playbooks/keyvalue.yml | 3 ++- playbooks/ldap.yml | 3 ++- playbooks/mongodb.yml | 3 ++- playbooks/neo4j.yml | 3 ++- playbooks/redis.yml | 3 ++- playbooks/relational.yml | 3 ++- playbooks/rest.yml | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/playbooks/cassandra.yml b/playbooks/cassandra.yml index c3e7dd4..ea36201 100644 --- a/playbooks/cassandra.yml +++ b/playbooks/cassandra.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/couchbase.yml b/playbooks/couchbase.yml index 9140097..20e10fa 100644 --- a/playbooks/couchbase.yml +++ b/playbooks/couchbase.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/elasticsearch.yml b/playbooks/elasticsearch.yml index bd43b51..79a64e9 100644 --- a/playbooks/elasticsearch.yml +++ b/playbooks/elasticsearch.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/jpa.yml b/playbooks/jpa.yml index 7676bcc..8013388 100644 --- a/playbooks/jpa.yml +++ b/playbooks/jpa.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/keyvalue.yml b/playbooks/keyvalue.yml index bd4592a..cd07fdd 100644 --- a/playbooks/keyvalue.yml +++ b/playbooks/keyvalue.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/ldap.yml b/playbooks/ldap.yml index a96f138..9c3c02a 100644 --- a/playbooks/ldap.yml +++ b/playbooks/ldap.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/mongodb.yml b/playbooks/mongodb.yml index d78adc9..75ae0ba 100644 --- a/playbooks/mongodb.yml +++ b/playbooks/mongodb.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/neo4j.yml b/playbooks/neo4j.yml index 465e13f..aa57ad1 100644 --- a/playbooks/neo4j.yml +++ b/playbooks/neo4j.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/redis.yml b/playbooks/redis.yml index e3e9183..574ae50 100644 --- a/playbooks/redis.yml +++ b/playbooks/redis.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/relational.yml b/playbooks/relational.yml index 344c02b..1ec2b76 100644 --- a/playbooks/relational.yml +++ b/playbooks/relational.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: diff --git a/playbooks/rest.yml b/playbooks/rest.yml index 3cb8786..711773e 100644 --- a/playbooks/rest.yml +++ b/playbooks/rest.yml @@ -26,7 +26,8 @@ content: - url: https://github.com/spring-projects/spring-data-commons # Refname matching: # https://docs.antora.org/antora/latest/playbook/content-refname-matching/ - branches: [ main, 3.2.x ] + branches: [ main, '{3..9}.*({0..9}).x', '!3.0.x', '!3.1.x' ] + tags: [ '({3..9}).+({0..9}).*', '!(3.0.*)', '!(3.1.*)','!3.2.0-M1','!3.2.0-M2' ] start_path: src/main/antora asciidoc: attributes: