[incubator-tamaya-site] branch vote-0.4-incubating-RC3 deleted (was df00424)

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a change to branch vote-0.4-incubating-RC3
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git.


 was df00424  TAMAYA-279: Add current RC to release history

This change permanently discards the following revisions:

 discard df00424  TAMAYA-279: Add current RC to release history



[incubator-tamaya-site] branch 0.4-incubating-vote-RC4 deleted (was f8b994e)

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a change to branch 0.4-incubating-vote-RC4
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git.


 was f8b994e  TAMAYA-279: Add current RC to release history and take 
changes from previous RC votes

This change permanently discards the following revisions:

 discard f8b994e  TAMAYA-279: Add current RC to release history and take 
changes from previous RC votes



[incubator-tamaya-site] branch vote-0.4-incubating-01 deleted (was df00424)

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a change to branch vote-0.4-incubating-01
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git.


 was df00424  TAMAYA-279: Add current RC to release history

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[incubator-tamaya-site] branch master updated: TAMAYA-411: Fix howto

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 6d5afd2  TAMAYA-411: Fix howto
6d5afd2 is described below

commit 6d5afd28b2bc032338784fea1babcc09f681a455
Author: Hugo Hirsch 
AuthorDate: Sun Nov 17 00:20:20 2019 +0100

TAMAYA-411: Fix howto
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 24c765c..daf5c97 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ You need write access to this repository and have to generate 
the javadoc manual
 ```
 $ cd tamaya
 $ git checkout master (to generate the current development version) OR
-$ git checkout 0.4-incubating (to generate the a stable release version)
+$ git checkout 0.4-incubating (to generate a stable release version)
 $ mvn site
 (since javadoc:javadoc does not generate a full report)
 ```



[incubator-tamaya-site] branch master updated: TAMAYA-412: Try to fix warning

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 781c689  TAMAYA-412: Try to fix warning
781c689 is described below

commit 781c6896b10b0a58f30f415aa29bc0e6b6686130
Author: Hugo Hirsch 
AuthorDate: Sun Nov 17 00:18:02 2019 +0100

TAMAYA-412: Try to fix warning
---
 content/history.adoc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/history.adoc b/content/history.adoc
index e136810..f1f2156 100644
--- a/content/history.adoc
+++ b/content/history.adoc
@@ -35,5 +35,4 @@ Overview of all released versions of Apache Tamaya.
 | 2015-08-22
 | 
https://archive.apache.org/dist/incubator/tamaya/0.1-incubating/ReleaseNotes-0.1-incubating.html[Release
 Notes for 0.1 incubating^]
 | https://archive.apache.org/dist/incubator/tamaya/0.1-incubating/[Download of 
0.1 incubating^]
-
 |===



[incubator-tamaya-site] branch master updated: TAMAYA-412: Add entry in release history

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 76cd12d  TAMAYA-412: Add entry in release history
76cd12d is described below

commit 76cd12d3ed023206d3f083469882fd6cbef0c17d
Author: Hugo Hirsch 
AuthorDate: Sun Nov 17 00:14:42 2019 +0100

TAMAYA-412: Add entry in release history
---
 content/history.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/history.adoc b/content/history.adoc
index d5142aa..e136810 100644
--- a/content/history.adoc
+++ b/content/history.adoc
@@ -17,7 +17,7 @@ Overview of all released versions of Apache Tamaya.
 | Download
 
 | 0.4-incubating
-| 2019-08-xx
+| 2019-11-11
 | n/a
 | https://archive.apache.org/dist/incubator/tamaya/0.4-incubating/[Download of 
0.4 incubating^]
 



[incubator-tamaya-site] branch master updated: TAMAYA-412: Fix wrong menu version in Javadoc

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 0cb68dd  TAMAYA-412: Fix wrong menu version in Javadoc
0cb68dd is described below

commit 0cb68dd03f1e42ed4c09e932bf433ee355caaece
Author: Hugo Hirsch 
AuthorDate: Sun Nov 17 00:12:42 2019 +0100

TAMAYA-412: Fix wrong menu version in Javadoc
---
 jbake.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jbake.properties b/jbake.properties
index 5513df3..774ccbc 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -18,5 +18,5 @@ asciidoctor.attributes.export=true
 twitterhandle=tamayaconf
 tamaya_version_released=0.4-incubating
 tamaya_version_development=0.5-incubating-SNAPSHOT
-tamaya_version=0.4-incubating
+tamaya_version=0.5-incubating-SNAPSHOT
 tamaya_mvn_group_id=org.apache.tamaya



[incubator-tamaya-site] branch master updated: TAMAYA-412: Update jbake props

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/master by this push:
 new dc0e622  TAMAYA-412: Update jbake props
dc0e622 is described below

commit dc0e622fd6fed5a583e29acd7f9a07e60a24e1d4
Author: Hugo Hirsch 
AuthorDate: Sun Nov 17 00:07:48 2019 +0100

TAMAYA-412: Update jbake props
---
 jbake.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jbake.properties b/jbake.properties
index f831bb5..5513df3 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -18,5 +18,5 @@ asciidoctor.attributes.export=true
 twitterhandle=tamayaconf
 tamaya_version_released=0.4-incubating
 tamaya_version_development=0.5-incubating-SNAPSHOT
-tamaya_version=0.4-incubating-SNAPSHOT
+tamaya_version=0.4-incubating
 tamaya_mvn_group_id=org.apache.tamaya



[incubator-tamaya-site] branch master updated (0f9f40e -> 7b95173)

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git.


from 0f9f40e  TAMAYA-392: Add links to ASF resources as requested, add meta 
tags
 add 3a394f1  TAMAYA-375 Added tamayaasastandard ascii doc page.
 add a6bad7b  Updated current sandbox extension list.
 add 32d4070  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/incubator-tamaya-site
 add a339277  TAMAYA-384 Improved Spring integration.
 add 7093105  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/incubator-tamaya-site
 add 1eb836c  TAMAYA-398 TAMAYA-399 TAMAYA-400 TAMAYA-401 TAMAYA-402 
TAMAYA-403 TAMAYA-404 TAMAYA-405 TAMAYA-406 TAMAYA-407 Added/updated docs.
 add f2a2b00  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/incubator-tamaya-site
 add c1eabf9  Updated release guide.
 add 9f67331  TAMAYA-398 TAMAYA-399 TAMAYA-400 TAMAYA-401 TAMAYA-402 
TAMAYA-403 TAMAYA-404 TAMAYA-405 TAMAYA-406 TAMAYA-407 Added/updated docs.
 add c52252e  Fix typos in HOCON doc
 add fc17976  Fix typos in JSON doc
 add 1e73bd2  Fix typos in docs
 add 8e59f81  Fix Tamaya as Standards, harmonize OSGi
 add 47eb706  Harmonize OSGi
 add 7f5b8b0  Harmonize OSGi
 add aa384b4  Harmonze OSGi, but not in methods
 add 2a2931f  Harmonze OSGi
 add 4cff93c  Fix missing version number replacement in new docs
 add d8f950b  TAMAYA-411: Prepare javadoc versions after new release
 add 94979a2  TAMAYA-411: Update docs about Javadoc generation and change 
URL to https
 new 7b95173  TAMAYA-412,TAMAYA-279: Add current RC to release history and 
take changes from previous RC votes

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md  |   4 +-
 content/development/possible-contributions.adoc|   4 +-
 content/documentation/api.adoc |   8 +-
 content/documentation/core.adoc|   2 +-
 content/documentation/extensions.adoc  |  34 ++--
 content/documentation/extensions/mod_cdi.adoc  |   2 +-
 content/documentation/extensions/mod_features.adoc |   2 +-
 .../extensions/{mod_json.adoc => mod_hjson.adoc}   |  47 ++---
 content/documentation/extensions/mod_hocon.adoc|  85 +
 .../documentation/extensions/mod_injection.adoc|   2 +-
 content/documentation/extensions/mod_json.adoc |  14 +-
 content/documentation/extensions/mod_osgi.adoc | 190 ++---
 content/documentation/extensions/mod_spring.adoc   |  82 +++--
 .../documentation/extensions/mod_usagetracker.adoc |   2 +-
 content/documentation/usecases.adoc|   2 +-
 content/highleveldesign.adoc   |   4 +-
 content/history.adoc   |   5 +
 content/release-guide.adoc |   8 +-
 content/tamayaasastandard.adoc |  73 
 jbake.properties   |   4 +-
 20 files changed, 355 insertions(+), 219 deletions(-)
 copy content/documentation/extensions/{mod_json.adoc => mod_hjson.adoc} (55%)
 create mode 100644 content/documentation/extensions/mod_hocon.adoc
 create mode 100644 content/tamayaasastandard.adoc



[incubator-tamaya-site] 01/01: TAMAYA-412, TAMAYA-279: Add current RC to release history and take changes from previous RC votes

2019-11-16 Thread pottlinger
This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git

commit 7b95173b2380ce81ebbd363930c00619f587de4a
Author: Hugo Hirsch 
AuthorDate: Tue Aug 27 23:36:07 2019 +0200

TAMAYA-412,TAMAYA-279: Add current RC to release history and take changes 
from previous RC votes

Merge in changes from last call as they were not on master yet
---
 content/history.adoc | 5 +
 1 file changed, 5 insertions(+)

diff --git a/content/history.adoc b/content/history.adoc
index 68a04b8..d5142aa 100644
--- a/content/history.adoc
+++ b/content/history.adoc
@@ -16,6 +16,11 @@ Overview of all released versions of Apache Tamaya.
 | Release Notes
 | Download
 
+| 0.4-incubating
+| 2019-08-xx
+| n/a
+| https://archive.apache.org/dist/incubator/tamaya/0.4-incubating/[Download of 
0.4 incubating^]
+
 | 0.3-incubating
 | 2016-09-12
 | n/a