TAMAYA-374 version substitution in source blocks
See https://github.com/asciidoctor/asciidoctor/issues/1741.
Turns out jbake was handing off the attributes to asciidoc just fine but
asciidoc doesn't interpolate those in source blocks by default. I added
the right command at the top of the blocks that contain jbake attributes, and
made some of the other blocks consistent. Looks better in local testing
now.
diff --git a/content/documentation/extensions/mod_camel.adoc b/content/documentation/extensions/mod_camel.adoc
index 64eed8c..41463dd 100644
--- a/content/documentation/extensions/mod_camel.adoc
+++ b/content/documentation/extensions/mod_camel.adoc
@@ -20,18 +20,17 @@
=== Compatibility
The module is based on Java 8.
-{jbake-tamaya_version}
=== Installation
To benefit from configuration builder support you only must add the corresponding dependency to your module:
-[source, xml, subs="attributes"]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-camel_beta</artifactId>
- <version>{jbake-tamaya_version}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
diff --git a/content/documentation/extensions/mod_cdi.adoc b/content/documentation/extensions/mod_cdi.adoc
index 818d891..8d2c0c6 100644
--- a/content/documentation/extensions/mod_cdi.adoc
+++ b/content/documentation/extensions/mod_cdi.adoc
@@ -36,6 +36,7 @@
code against the injection API without dependency on the concrete injection implementation. As a consequence your
components will be compatible regardless if deployed in a pure SE or as Java EE (CDI) or Spring environment:
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -56,7 +57,7 @@
you never have installed both CDI extensions at the same time because this may be lead to unforseen side-effects.
.CDI Java EE Application Configuration
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -69,7 +70,7 @@
following dependency. If this dependency is missing injection is purely based on
CDI injection features.
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_classloader_support.adoc b/content/documentation/extensions/mod_classloader_support.adoc
index d816f50..bfa73cf 100644
--- a/content/documentation/extensions/mod_classloader_support.adoc
+++ b/content/documentation/extensions/mod_classloader_support.adoc
@@ -29,7 +29,7 @@
To benefit from configuration server support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_collections.adoc b/content/documentation/extensions/mod_collections.adoc
index 8716688..6cfc846 100644
--- a/content/documentation/extensions/mod_collections.adoc
+++ b/content/documentation/extensions/mod_collections.adoc
@@ -27,7 +27,7 @@
To use Tamaya collection support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -322,4 +322,4 @@
server.1.name=server2, localhost:8000, master=true
server.2=server3, localhost:8003
[META]server.item-converter=com.mycompany.config.ServerConverter
------------------------------------------------
\ No newline at end of file
+-----------------------------------------------
diff --git a/content/documentation/extensions/mod_consul.adoc b/content/documentation/extensions/mod_consul.adoc
index 094e8be..5791931 100644
--- a/content/documentation/extensions/mod_consul.adoc
+++ b/content/documentation/extensions/mod_consul.adoc
@@ -29,7 +29,7 @@
To use _tamaya-consul_ you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -73,4 +73,4 @@
=== The AbstractConsulPropertySource
The +AbstractConsulPropertySource+ provides all features from +ConsulPropertySource+ but does not define how the
-property source is exactly configured, so you have full control.
\ No newline at end of file
+property source is exactly configured, so you have full control.
diff --git a/content/documentation/extensions/mod_etcd.adoc b/content/documentation/extensions/mod_etcd.adoc
index 536ff41..b434106 100644
--- a/content/documentation/extensions/mod_etcd.adoc
+++ b/content/documentation/extensions/mod_etcd.adoc
@@ -28,7 +28,7 @@
To use _etcd_ as a configuration backend you only must add the corresponding dependency to
your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -66,4 +66,4 @@
=== The AbstractEtcdPropertySource
The +AbstractEtcdPropertySource+ is the base class used by +EtcdPropertySource+. Use it to implement your own custom
-etcd property source.
\ No newline at end of file
+etcd property source.
diff --git a/content/documentation/extensions/mod_events.adoc b/content/documentation/extensions/mod_events.adoc
index 44b0a94..7d303fe 100644
--- a/content/documentation/extensions/mod_events.adoc
+++ b/content/documentation/extensions/mod_events.adoc
@@ -33,7 +33,7 @@
To benefit from configuration event support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_features.adoc b/content/documentation/extensions/mod_features.adoc
index c3299bd..4379fe5 100644
--- a/content/documentation/extensions/mod_features.adoc
+++ b/content/documentation/extensions/mod_features.adoc
@@ -25,7 +25,7 @@
To use Tamaya _Features_ you only must add the corresponding dependency to
your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_filter.adoc b/content/documentation/extensions/mod_filter.adoc
index a41d187..7c76c16 100644
--- a/content/documentation/extensions/mod_filter.adoc
+++ b/content/documentation/extensions/mod_filter.adoc
@@ -29,7 +29,7 @@
To benefit from filter support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_formats.adoc b/content/documentation/extensions/mod_formats.adoc
index db3202c..719b877 100644
--- a/content/documentation/extensions/mod_formats.adoc
+++ b/content/documentation/extensions/mod_formats.adoc
@@ -30,7 +30,7 @@
To use the formats module you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_functions.adoc b/content/documentation/extensions/mod_functions.adoc
index 7287924..3a6e6b7 100644
--- a/content/documentation/extensions/mod_functions.adoc
+++ b/content/documentation/extensions/mod_functions.adoc
@@ -35,7 +35,7 @@
For using the functionality shown in this document you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_hazelcast.adoc b/content/documentation/extensions/mod_hazelcast.adoc
index c8cecca..db0d30e 100644
--- a/content/documentation/extensions/mod_hazelcast.adoc
+++ b/content/documentation/extensions/mod_hazelcast.adoc
@@ -30,7 +30,7 @@
To use _tamaya-hazelcast_ you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -87,4 +87,4 @@
=== The AbstractHazelcastPropertySource
The +AbstractHazelcastPropertySource+ is the baseclass used by +HazelcastPropertySource+. Use it to implement your own
-Hazelcast based property source.
\ No newline at end of file
+Hazelcast based property source.
diff --git a/content/documentation/extensions/mod_injection.adoc b/content/documentation/extensions/mod_injection.adoc
index 3074a5d..1581fc4 100644
--- a/content/documentation/extensions/mod_injection.adoc
+++ b/content/documentation/extensions/mod_injection.adoc
@@ -29,7 +29,7 @@
Basically Tamaya's injection API is deployed as API artifact:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
@@ -40,7 +40,7 @@
To use injection with Java SE you must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_jndi.adoc b/content/documentation/extensions/mod_jndi.adoc
index 74b98bc..4be4d37 100644
--- a/content/documentation/extensions/mod_jndi.adoc
+++ b/content/documentation/extensions/mod_jndi.adoc
@@ -26,7 +26,7 @@
To use _jndi_ as a configuration backend you only must add the corresponding dependency to
your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_jodatime.adoc b/content/documentation/extensions/mod_jodatime.adoc
index 13d5035..8849ea6 100644
--- a/content/documentation/extensions/mod_jodatime.adoc
+++ b/content/documentation/extensions/mod_jodatime.adoc
@@ -21,7 +21,7 @@
To support Joda-Time types as configuration values, you only have to add the following
maven dependency to your project:
-[source, listing]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<grooupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_json.adoc b/content/documentation/extensions/mod_json.adoc
index ee2323c..a7bb7e5 100644
--- a/content/documentation/extensions/mod_json.adoc
+++ b/content/documentation/extensions/mod_json.adoc
@@ -46,7 +46,7 @@
To use the JSON extension module you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_management.adoc b/content/documentation/extensions/mod_management.adoc
index ca38d18..b4f8a16 100644
--- a/content/documentation/extensions/mod_management.adoc
+++ b/content/documentation/extensions/mod_management.adoc
@@ -25,7 +25,7 @@
To use the _management_ extension you only must add the corresponding dependency
to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_metamodel.adoc b/content/documentation/extensions/mod_metamodel.adoc
index 3cec143..285542b 100644
--- a/content/documentation/extensions/mod_metamodel.adoc
+++ b/content/documentation/extensions/mod_metamodel.adoc
@@ -78,7 +78,7 @@
To use _metamodel_ features you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_microprofile.adoc b/content/documentation/extensions/mod_microprofile.adoc
index c9cfe3e..a8a4545 100644
--- a/content/documentation/extensions/mod_microprofile.adoc
+++ b/content/documentation/extensions/mod_microprofile.adoc
@@ -33,7 +33,7 @@
To benefit from Tamaya Microprofile you only must one of the following dependencies to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_mutable_config.adoc b/content/documentation/extensions/mod_mutable_config.adoc
index 4a61426..6aa0573 100644
--- a/content/documentation/extensions/mod_mutable_config.adoc
+++ b/content/documentation/extensions/mod_mutable_config.adoc
@@ -28,7 +28,7 @@
To benefit from configuration mutability support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_optional.adoc b/content/documentation/extensions/mod_optional.adoc
index cc3e58b..03e85a0 100644
--- a/content/documentation/extensions/mod_optional.adoc
+++ b/content/documentation/extensions/mod_optional.adoc
@@ -31,7 +31,7 @@
To use Tamaya _optional_ you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_osgi.adoc b/content/documentation/extensions/mod_osgi.adoc
index 241f795..14f833a 100644
--- a/content/documentation/extensions/mod_osgi.adoc
+++ b/content/documentation/extensions/mod_osgi.adoc
@@ -37,7 +37,7 @@
To benefit from Tamaya in an OSGI context you must deploy at least the following modules to
your OSGI runtime environment:
-[source, listing]
+[source, listing, subs=attributes+]
-----------------------------------------------
# Runtime with OSGI ConfigAdmin support, e.g.
org.apache.felix:org.apache.felix.configadmin:{felix_version}
@@ -811,4 +811,4 @@
Apache Tamaya also provides the same commands as described for _Karaf_, but executable in
plaing Gogo console as used by Apache Felix and Equinox as
+org.apache.tamaya.ext:tamaya-gogo-shell:{tamaya-version}+. Refer to the previous sections for
-a detailed command description.
\ No newline at end of file
+a detailed command description.
diff --git a/content/documentation/extensions/mod_remote.adoc b/content/documentation/extensions/mod_remote.adoc
index 9c234f1..6758ff9 100644
--- a/content/documentation/extensions/mod_remote.adoc
+++ b/content/documentation/extensions/mod_remote.adoc
@@ -28,7 +28,7 @@
To use remote support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_resolver.adoc b/content/documentation/extensions/mod_resolver.adoc
index 1bf6b86..1e6cc13 100644
--- a/content/documentation/extensions/mod_resolver.adoc
+++ b/content/documentation/extensions/mod_resolver.adoc
@@ -28,7 +28,7 @@
To benefit from dynamic value resolution you only must add the corresponding dependency to your module:
-[source, xml, subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_resources.adoc b/content/documentation/extensions/mod_resources.adoc
index 5ee5657..2c3399a 100644
--- a/content/documentation/extensions/mod_resources.adoc
+++ b/content/documentation/extensions/mod_resources.adoc
@@ -24,7 +24,7 @@
To use this module add the following dependency:
-[source, listing, subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<grooupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_server.adoc b/content/documentation/extensions/mod_server.adoc
index 2d38221..9da0d48 100644
--- a/content/documentation/extensions/mod_server.adoc
+++ b/content/documentation/extensions/mod_server.adoc
@@ -27,7 +27,7 @@
To benefit from configuration server support you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_spring.adoc b/content/documentation/extensions/mod_spring.adoc
index 798431b..c429012 100644
--- a/content/documentation/extensions/mod_spring.adoc
+++ b/content/documentation/extensions/mod_spring.adoc
@@ -35,7 +35,7 @@
To benefit from Tamaya Spring integration add the following dependencies to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_usagetracker.adoc b/content/documentation/extensions/mod_usagetracker.adoc
index 4cd0579..395c048 100644
--- a/content/documentation/extensions/mod_usagetracker.adoc
+++ b/content/documentation/extensions/mod_usagetracker.adoc
@@ -27,7 +27,7 @@
To use Tamaya _usagetracker_ you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_validation.adoc b/content/documentation/extensions/mod_validation.adoc
index 897bb56..acfdcbd 100644
--- a/content/documentation/extensions/mod_validation.adoc
+++ b/content/documentation/extensions/mod_validation.adoc
@@ -27,7 +27,7 @@
To activate configuration _validation_ you only must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_vertx.adoc b/content/documentation/extensions/mod_vertx.adoc
index 906367d..0501f28 100644
--- a/content/documentation/extensions/mod_vertx.adoc
+++ b/content/documentation/extensions/mod_vertx.adoc
@@ -30,7 +30,7 @@
To use Tamaya's _Vertx_ support you only must add the corresponding dependency to
your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/extensions/mod_yaml.adoc b/content/documentation/extensions/mod_yaml.adoc
index da76eba..cadbc19 100644
--- a/content/documentation/extensions/mod_yaml.adoc
+++ b/content/documentation/extensions/mod_yaml.adoc
@@ -27,7 +27,7 @@
To use YAML as configuration format you must add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
diff --git a/content/documentation/quickstart.adoc b/content/documentation/quickstart.adoc
index 3455b5b..980b63a 100644
--- a/content/documentation/quickstart.adoc
+++ b/content/documentation/quickstart.adoc
@@ -8,7 +8,7 @@
provides a simple configuration API. To start add the following
dependency to your project:
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
----
<dependency>
<groupId>{tamaya_mvn_group_id}</groupId>
@@ -116,7 +116,7 @@
==== Dynamic Resolution and Value Placeholders
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
----
<dependency>
<artifactId>org.apache.tamaya.ext</id>
@@ -140,7 +140,7 @@
==== Ant-styled Path Resolution of Resources
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
----
<dependency>
<artifactId>org.apache.tamaya.ext</id>
@@ -154,7 +154,7 @@
description, e.g.
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
----
Collection<URL> urls = Resolver.getInstance().getResources("META-INF/cfg/**/*.properties");
----
@@ -164,7 +164,7 @@
==== Configuration Injection
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
----
<dependency>
<artifactId>org.apache.tamaya.ext</id>
@@ -178,7 +178,7 @@
Corresponding configuration:
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
----
public class MyType {
@Config("my.key")
@@ -195,7 +195,7 @@
Or the same as template:
-[source,xml,subs="verbatim,attributes"]
+[source, xml]
----
public interface MyTypeTemplate {
@Config("my.key")
diff --git a/content/documentation/spisupport.adoc b/content/documentation/spisupport.adoc
index 82c4cec..610724c 100644
--- a/content/documentation/spisupport.adoc
+++ b/content/documentation/spisupport.adoc
@@ -51,7 +51,7 @@
To use Tamaya's _spisupport_ you only have to add the corresponding dependency to your module:
-[source, xml]
+[source, xml, subs=attributes+]
-----------------------------------------------
<dependency>
<groupId>org.apache.tamaya</groupId>
diff --git a/content/download.adoc b/content/download.adoc
index 3e8bf34..31b064d 100644
--- a/content/download.adoc
+++ b/content/download.adoc
@@ -32,7 +32,7 @@
// @todo Source highlighting does not work currently.
//
-[source,xml,subs="verbatim,attributes"]
+[source, xml, subs=attributes+]
----
<dependency>
<groupId>{tamaya_mvn_group_id}</groupId>
diff --git a/jbake.properties b/jbake.properties
index 84b7f80..5a868b7 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -15,8 +15,8 @@
template.encoding=UTF-8
# Make properties available in templates
asciidoctor.attributes.export=true
-asciidoctor.attributes.prefix=jbake-
twitterhandle=tamayaconf
tamaya_version_released=0.3-incubating
+tamaya_version_development=0.4-incubating-SNAPSHOT
tamaya_version=0.4-incubating-SNAPSHOT
tamaya_mvn_group_id=org.apache.tamaya
