You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/03/08 17:21:30 UTC
[1/5] incubator-tamaya git commit: Fixed invalid build guidelines.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 77f157615 -> 14944e22a
Fixed invalid build guidelines.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/336ed20d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/336ed20d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/336ed20d
Branch: refs/heads/master
Commit: 336ed20d9990030e9441fd5d35722c7de1612876
Parents: 77f1576
Author: anatole <an...@apache.org>
Authored: Tue Mar 8 12:54:37 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 8 12:54:37 2016 +0100
----------------------------------------------------------------------
README.md | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/336ed20d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 70727a3..d325f5f 100644
--- a/README.md
+++ b/README.md
@@ -19,24 +19,10 @@ More information on Tamaya can be found on the [homepage of Apache Tamaya](http:
## Building Apache Tamaya
-The Apache Tamaya project contains modules which are intended to be used with Java 8 and others
-which are for Java 7.
+The Apache Tamaya project is built with Maven 3 and Java 7, so you need JDK 1.7 and reasonable version of maven
+be installed on your computer.
-If you would like to build Tamaya you need to have both JDK 1.7 and JDK 1.8
-installed on your computer.
-To tell Maven which JDK it should use for each of the projects we do leverage the
-[Maven Toolchain Plugin](https://maven.apache.org/plugins/maven-toolchains-plugin/) and Mavens toolchains support.
-
-See the following links for more information
-
-- [http://maven.apache.org/ref/3.2.5/maven-core/toolchains.html]()
-- [http://maven.apache.org/guides/mini/guide-using-toolchains.html]()
-
-The easiest way to setup your computer for being able to use toolchains is to
-simply copy the provided `./toolchains.xml` sample to `~/.m2/toolchains.xml` and
-edit the paths to your own JDK installations.
-
-If your Maven toolchain is installed correctly you can build Tamaya by the following command:
+Then you can build Tamaya by the following command:
$> mvn clean install
[2/5] incubator-tamaya git commit: Added release notes for
0.2-incubating.
Posted by an...@apache.org.
Added release notes for 0.2-incubating.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ac6854b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ac6854b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ac6854b9
Branch: refs/heads/master
Commit: ac6854b9f054a26675e578cc128609580511b75c
Parents: 336ed20
Author: anatole <an...@apache.org>
Authored: Tue Mar 8 15:32:09 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 8 15:32:09 2016 +0100
----------------------------------------------------------------------
readme/ReleaseNotes-0.2-incubating.html | 123 +++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ac6854b9/readme/ReleaseNotes-0.2-incubating.html
----------------------------------------------------------------------
diff --git a/readme/ReleaseNotes-0.2-incubating.html b/readme/ReleaseNotes-0.2-incubating.html
new file mode 100644
index 0000000..e28c801
--- /dev/null
+++ b/readme/ReleaseNotes-0.2-incubating.html
@@ -0,0 +1,123 @@
+
+Release Notes - Tamaya - Version 0.2-incubating
+
+<h2> Sub-task
+</h2>
+<ul>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-86'>TAMAYA-86</a>] - Support for org.joda.time.DateTime
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-87'>TAMAYA-87</a>] - Support for org.joda.time.DateTimeZone
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-96'>TAMAYA-96</a>] - Integrate the quickstart guide in the new homepage
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-97'>TAMAYA-97</a>] - Integrate the JavaDoc of the current version of Tamaya into the new homepage
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-106'>TAMAYA-106</a>] - Add standard Maven project reports to the new site
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-118'>TAMAYA-118</a>] - Integrate the the information how to get the source of TAMAYA in the new homepage
+ </li>
+</ul>
+
+<h2> Bug
+</h2>
+<ul>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-49'>TAMAYA-49</a>] - create a Java7 compatible API
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-67'>TAMAYA-67</a>] - PropertyConverter: add info for supported formats
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-107'>TAMAYA-107</a>] - ServiceContext SPI is not backward compatible
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-108'>TAMAYA-108</a>] - Injection is also tried on non configured types and fields.
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-109'>TAMAYA-109</a>] - ServiceContextManager fails to correctly select the ServiceContext in case of multiples
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-127'>TAMAYA-127</a>] - NoSuchElementException when using resolver and property values containing an incomplete token
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-130'>TAMAYA-130</a>] - Add Camel integration
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-131'>TAMAYA-131</a>] - typo in quickstart maven url
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-134'>TAMAYA-134</a>] - Fix javadoc issues before releasing 0.2
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-136'>TAMAYA-136</a>] - Return structure when accessing a singletPropertyValue
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-138'>TAMAYA-138</a>] - Parent pom contains invalid Arquillian groupId
+ </li>
+</ul>
+
+<h2> Improvement
+</h2>
+<ul>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-50'>TAMAYA-50</a>] - add test ServiceContextManager
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-92'>TAMAYA-92</a>] - Replace Jackson with Apache Johnzon
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-93'>TAMAYA-93</a>] - Check and Fix Delivery / Distribution Issues
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-94'>TAMAYA-94</a>] - Make the builder module Java 7 compatible
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-113'>TAMAYA-113</a>] - Remove Java 8 related parts
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-114'>TAMAYA-114</a>] - Add module with reusable SPI base classes
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-123'>TAMAYA-123</a>] - Render modules into OSGI bundles
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-124'>TAMAYA-124</a>] - Move Injection Annotation shared by SE and EE support into common module
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-125'>TAMAYA-125</a>] - Remove Event Support from injection module (should be part of event module)
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-126'>TAMAYA-126</a>] - Make thee resources module Java 7 compatible
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-132'>TAMAYA-132</a>] - Remove @ConfigDefault in favour of @Config(defaultValue=...)
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-137'>TAMAYA-137</a>] - Enhance filter API adding a FilterContext
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-139'>TAMAYA-139</a>] - Integrate maven version of Tamaya into JSON being exposed in its implementation
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-140'>TAMAYA-140</a>] - Update to latest httpcore (4.4.4) / update to latest httpclient
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-141'>TAMAYA-141</a>] - org.apache.tamaya.etcd.EtcdAccessor should use try with resources when performing http requests
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-142'>TAMAYA-142</a>] - Etcd module - fix OSGi declarations
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-143'>TAMAYA-143</a>] - Add support for consul (Hashicorp) as read/write backend
+ </li>
+</ul>
+
+<h2> New Feature
+</h2>
+<ul>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-70'>TAMAYA-70</a>] - JMX interface for Tamaya
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-71'>TAMAYA-71</a>] - Support YAML as configuration format
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-110'>TAMAYA-110</a>] - Add Support for integrating with Spring Environment and Configuration.
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-111'>TAMAYA-111</a>] - Add Classloader aware ServiceContext
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-112'>TAMAYA-112</a>] - Add Module Support for Collections
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-115'>TAMAYA-115</a>] - Add Support for dynamic configuration observer mechanism
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-116'>TAMAYA-116</a>] - Integrate Sabot implementation with Tamaya
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-120'>TAMAYA-120</a>] - Add Observer for triggering events on certain configuration key ranges.
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-121'>TAMAYA-121</a>] - Add OSGI Fragment to replace ConfigurationAdmin
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-128'>TAMAYA-128</a>] - Adding ConversionContext to converter params
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-133'>TAMAYA-133</a>] - Add PropertySource which connects to a etcd server
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-135'>TAMAYA-135</a>] - Add support for changing of configuration sources.
+ </li>
+</ul>
+
+<h2> Task
+</h2>
+<ul>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-42'>TAMAYA-42</a>] - Implement Basic Infrastructure
+ </li>
+ <li>[<a href='https://issues.apache.org/jira/browse/TAMAYA-51'>TAMAYA-51</a>] - change version to 0.2-incubating-SNAPSHOT
+ </li>
+</ul>
Re: [5/5] incubator-tamaya git commit: Fixed versions and
distribution.
Posted by "Oliver B. Fischer" <o....@swe-blog.net>.
Ok, so happy bug fixing!
Am 09.03.16 um 20:27 schrieb Anatole Tresch:
> Hi guys
>
> I added one param for the release plugin
> on the top level pom preparing the release. Looks like I messed the plugin
> versions up. I will continue with the release on the weekend or maybe
> tomorrow when traveling.
>
> I had to fix quite some outdated docs but it looks better by each commit
> done😆.
>
> J
> Anatole
> Am 09.03.2016 17:12 schrieb "Oliver B. Fischer" <o....@swe-blog.net>:
>
>> Will investigate it in the evening...
>>
>> Am 08.03.16 um 23:55 schrieb P. Ottlinger:
>>
>> --
>> N Oliver B. Fischer
>> A Schönhauser Allee 64, 10437 Berlin, Deutschland/Germany
>> P +49 30 44793251
>> M +49 178 7903538
>> E o.b.fischer@swe-blog.net
>> S oliver.b.fischer
>> J oliver.b.fischer@jabber.org
>> X http://xing.to/obf
>>
>>
--
N Oliver B. Fischer
A Schönhauser Allee 64, 10437 Berlin, Deutschland/Germany
P +49 30 44793251
M +49 178 7903538
E o.b.fischer@swe-blog.net
S oliver.b.fischer
J oliver.b.fischer@jabber.org
X http://xing.to/obf
Re: [5/5] incubator-tamaya git commit: Fixed versions and distribution.
Posted by Anatole Tresch <at...@gmail.com>.
Hi guys
I added one param for the release plugin
on the top level pom preparing the release. Looks like I messed the plugin
versions up. I will continue with the release on the weekend or maybe
tomorrow when traveling.
I had to fix quite some outdated docs but it looks better by each commit
done😆.
J
Anatole
Am 09.03.2016 17:12 schrieb "Oliver B. Fischer" <o....@swe-blog.net>:
> Will investigate it in the evening...
>
> Am 08.03.16 um 23:55 schrieb P. Ottlinger:
>
>> Hi!
>>
>> I'm not sure which commit introduced it but a local
>> mvn clean compile javadoc:javadoc
>> yields plenty of warnings:
>>
>>
>> [INFO] Scanning for projects...
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya:buildconfigurations:jar:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for org.apache.tamaya:tamaya-api:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for org.apache.tamaya:tamaya-core:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for org.apache.tamaya:tamaya-code:pom:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for org.apache.tamaya.ext:tamaya-builder:jar:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>>
>> org.apache.tamaya.ext:tamaya-classloader-support:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-collections:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-events:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-filter:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-formats:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-functions:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-injection:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> [WARNING]
>> [WARNING] Some problems were encountered while building the effective
>> model for
>> org.apache.tamaya.ext:tamaya-injection-api:bundle:0.2-incubating-SNAPSHOT
>> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
>> found duplicate declaration of plugin
>> org.apache.maven.plugins:maven-release-plugin @
>> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
>> incubator-tamaya/pom.xml, line 702, column 21
>> and many more.
>>
>> Can you fix them before starting to release?
>>
>> Thanks,
>> Phil
>>
>>
> --
> N Oliver B. Fischer
> A Schönhauser Allee 64, 10437 Berlin, Deutschland/Germany
> P +49 30 44793251
> M +49 178 7903538
> E o.b.fischer@swe-blog.net
> S oliver.b.fischer
> J oliver.b.fischer@jabber.org
> X http://xing.to/obf
>
>
Re: [5/5] incubator-tamaya git commit: Fixed versions and
distribution.
Posted by "Oliver B. Fischer" <o....@swe-blog.net>.
Will investigate it in the evening...
Am 08.03.16 um 23:55 schrieb P. Ottlinger:
> Hi!
>
> I'm not sure which commit introduced it but a local
> mvn clean compile javadoc:javadoc
> yields plenty of warnings:
>
>
> [INFO] Scanning for projects...
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya:buildconfigurations:jar:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya:tamaya-api:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya:tamaya-core:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya:tamaya-code:pom:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya.ext:tamaya-builder:jar:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-classloader-support:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-collections:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya.ext:tamaya-events:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for org.apache.tamaya.ext:tamaya-filter:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-formats:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-functions:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-injection:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> [WARNING]
> [WARNING] Some problems were encountered while building the effective
> model for
> org.apache.tamaya.ext:tamaya-injection-api:bundle:0.2-incubating-SNAPSHOT
> [WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
> found duplicate declaration of plugin
> org.apache.maven.plugins:maven-release-plugin @
> org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
> incubator-tamaya/pom.xml, line 702, column 21
> and many more.
>
> Can you fix them before starting to release?
>
> Thanks,
> Phil
>
--
N Oliver B. Fischer
A Schönhauser Allee 64, 10437 Berlin, Deutschland/Germany
P +49 30 44793251
M +49 178 7903538
E o.b.fischer@swe-blog.net
S oliver.b.fischer
J oliver.b.fischer@jabber.org
X http://xing.to/obf
Re: [5/5] incubator-tamaya git commit: Fixed versions and
distribution.
Posted by "P. Ottlinger" <po...@apache.org>.
Hi!
I'm not sure which commit introduced it but a local
mvn clean compile javadoc:javadoc
yields plenty of warnings:
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya:buildconfigurations:jar:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya:tamaya-api:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya:tamaya-core:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya:tamaya-code:pom:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya.ext:tamaya-builder:jar:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-classloader-support:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-collections:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya.ext:tamaya-events:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for org.apache.tamaya.ext:tamaya-filter:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-formats:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-functions:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-injection:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
[WARNING]
[WARNING] Some problems were encountered while building the effective
model for
org.apache.tamaya.ext:tamaya-injection-api:bundle:0.2-incubating-SNAPSHOT
[WARNING] 'build.plugins.plugin.(groupId:artifactId)' must be unique but
found duplicate declaration of plugin
org.apache.maven.plugins:maven-release-plugin @
org.apache.tamaya:tamaya-all:0.2-incubating-SNAPSHOT,
incubator-tamaya/pom.xml, line 702, column 21
and many more.
Can you fix them before starting to release?
Thanks,
Phil
[5/5] incubator-tamaya git commit: Fixed versions and distribution.
Posted by an...@apache.org.
Fixed versions and distribution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/14944e22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/14944e22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/14944e22
Branch: refs/heads/master
Commit: 14944e22aa988f2e17e03705ffee62b4f1dd09b2
Parents: 2fa8b7d
Author: anatole <an...@apache.org>
Authored: Tue Mar 8 17:07:53 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 8 17:07:53 2016 +0100
----------------------------------------------------------------------
distribution/pom.xml | 248 ++++++++-----
.../src/main/assembly/distribution-bin.xml | 348 +++++++++++++++----
modules/model/pom.xml | 1 -
modules/pom.xml | 27 +-
modules/remote/pom.xml | 76 ----
.../tamaya/remote/BaseRemotePropertySource.java | 149 --------
sandbox/pom.xml | 1 +
sandbox/remote/pom.xml | 76 ++++
.../tamaya/remote/BaseRemotePropertySource.java | 149 ++++++++
9 files changed, 685 insertions(+), 390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index fa8610d..453d86a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -99,27 +99,45 @@ under the License.
<classifier>javadoc</classifier>
</dependency>
- <!-- JSON module -->
+ <!-- Classloader support module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
+ <artifactId>tamaya-classloader-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
+ <artifactId>tamaya-classloader-support</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-json</artifactId>
+ <artifactId>tamaya-classloader-support</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- JSON module -->
+ <!-- Collection module -->
+
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-collections</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-collections</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-collections</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
<!-- Events module -->
@@ -141,7 +159,25 @@ under the License.
<classifier>javadoc</classifier>
</dependency>
- <!-- Events module -->
+ <!-- Filter module -->
+
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-filter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-filter</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-filter</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
<!-- Formats module -->
@@ -163,7 +199,43 @@ under the License.
<classifier>javadoc</classifier>
</dependency>
- <!-- Formats module -->
+ <!-- functions module -->
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-functions</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-functions</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-functions</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <!-- Injection module -->
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-injection</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-injection</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-injection</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
<!-- Injection-api module -->
<dependency>
@@ -183,307 +255,317 @@ under the License.
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Injection-api module -->
- <!-- Injection module -->
+ <!-- JSON module -->
+
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-injection</artifactId>
+ <artifactId>tamaya-json</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-injection</artifactId>
+ <artifactId>tamaya-json</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-injection</artifactId>
+ <artifactId>tamaya-json</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Injection module -->
- <!-- Resolver module -->
+ <!-- Management module -->
+
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resolver</artifactId>
+ <artifactId>tamaya-management</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resolver</artifactId>
+ <artifactId>tamaya-management</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resolver</artifactId>
+ <artifactId>tamaya-management</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Resolver module -->
- <!-- Resources module -->
+ <!-- Model module -->
+
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resources</artifactId>
+ <artifactId>tamaya-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resources</artifactId>
+ <artifactId>tamaya-model</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-resources</artifactId>
+ <artifactId>tamaya-model</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Resources module -->
- <!-- Classloader Support module -->
+ <!-- Mutable Config module -->
+
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-classloader-support</artifactId>
+ <artifactId>tamaya-mutable-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-classloader-support</artifactId>
+ <artifactId>tamaya-mutable-config</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-classloader-support</artifactId>
+ <artifactId>tamaya-mutable-config</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Classloader Support module -->
- <!-- functions module -->
+ <!-- Optional module -->
+
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-optional</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-optional</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-optional</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- functions module -->
- <!-- functions module -->
+ <!-- Resolver module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-resolver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-resolver</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-functions</artifactId>
+ <artifactId>tamaya-resolver</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- functions module -->
- <!-- CDI module -->
+ <!-- Resources module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi</artifactId>
+ <artifactId>tamaya-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi</artifactId>
+ <artifactId>tamaya-resources</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi</artifactId>
+ <artifactId>tamaya-resources</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- CDI module -->
- <!-- CDI-SE module -->
+ <!-- Resources module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi-se</artifactId>
+ <artifactId>tamaya-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi-se</artifactId>
+ <artifactId>tamaya-server</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-cdi-se</artifactId>
+ <artifactId>tamaya-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <!-- SPI SUpport -->
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-spisupport</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-spisupport</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-spisupport</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- CDI-SE module -->
- <!-- OSGI Felix module -->
+ <!-- ******* INtegration ******* -->
+
+ <!-- Camel module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-felix</artifactId>
+ <artifactId>tamaya-camel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-felix</artifactId>
+ <artifactId>tamaya-camel</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-felix</artifactId>
+ <artifactId>tamaya-camel</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- OSGI Felix module -->
- <!-- OSGI General -->
+ <!-- CDI module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-general</artifactId>
+ <artifactId>tamaya-cdi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-general</artifactId>
+ <artifactId>tamaya-cdi</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-osgi-general</artifactId>
+ <artifactId>tamaya-cdi</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- OSGI General -->
- <!-- Spring Integration -->
+ <!-- CDI-SE module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spring</artifactId>
+ <artifactId>tamaya-cdi-se</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spring</artifactId>
+ <artifactId>tamaya-cdi-se</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spring</artifactId>
+ <artifactId>tamaya-cdi-se</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Spring Integration -->
- <!-- Optional Integration -->
+ <!-- Consul module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-optional</artifactId>
+ <artifactId>tamaya-consul</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-optional</artifactId>
+ <artifactId>tamaya-consul</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-optional</artifactId>
+ <artifactId>tamaya-consul</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Optional Integration -->
- <!-- Remote Integration -->
+ <!-- etcd module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-remote</artifactId>
+ <artifactId>tamaya-etcd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-remote</artifactId>
+ <artifactId>tamaya-etcd</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-remote</artifactId>
+ <artifactId>tamaya-etcd</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Remote Integration -->
- <!-- Remote Integration -->
+ <!-- OSGI module -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-server</artifactId>
+ <artifactId>tamaya-osgi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-server</artifactId>
+ <artifactId>tamaya-osgi</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-server</artifactId>
+ <artifactId>tamaya-osgi</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- Remote Integration -->
- <!-- SPI SUpport -->
+ <!-- Spring Integration -->
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spisupport</artifactId>
+ <artifactId>tamaya-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spisupport</artifactId>
+ <artifactId>tamaya-spring</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-spisupport</artifactId>
+ <artifactId>tamaya-spring</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
- <!-- SPI SUpport -->
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/distribution/src/main/assembly/distribution-bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/distribution-bin.xml b/distribution/src/main/assembly/distribution-bin.xml
index ad3f179..4ddad18 100644
--- a/distribution/src/main/assembly/distribution-bin.xml
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -30,10 +30,10 @@ under the License.
<dependencySets>
<dependencySet>
- <outputDirectory>java7/lib</outputDirectory>
+ <outputDirectory>java/lib</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-java7-api</include>
- <include>org.apache.tamaya:tamaya-java7-core</include>
+ <include>org.apache.tamaya:tamaya-api</include>
+ <include>org.apache.tamaya:tamaya-core</include>
</includes>
<excludes>
<exclude>*:*:*:sources</exclude>
@@ -41,72 +41,72 @@ under the License.
</excludes>
</dependencySet>
<dependencySet>
- <outputDirectory>java7/sources</outputDirectory>
+ <outputDirectory>java/sources</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-java7-api:*:sources</include>
- <include>org.apache.tamaya:tamaya-java7-core:*:sources</include>
+ <include>org.apache.tamaya:tamaya-api:*:sources</include>
+ <include>org.apache.tamaya:tamaya-core:*:sources</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>java7/javadoc</outputDirectory>
+ <outputDirectory>java/javadoc</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-java7-api:*:javadoc</include>
- <include>org.apache.tamaya:tamaya-java7-core:*:javadoc</include>
+ <include>org.apache.tamaya:tamaya-api:*:javadoc</include>
+ <include>org.apache.tamaya:tamaya-core:*:javadoc</include>
</includes>
</dependencySet>
+
+ <!-- ***** modules ***** -->
+
+ <!-- Builder module -->
<dependencySet>
- <outputDirectory>java8/lib</outputDirectory>
+ <outputDirectory>modules/builder/lib</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-api</include>
- <include>org.apache.tamaya:tamaya-core</include>
+ <include>org.apache.tamaya.ext:tamaya-builder</include>
</includes>
- <excludes>
- <exclude>*:*:sources</exclude>
- <exclude>*:*:javadoc</exclude>
- </excludes>
</dependencySet>
<dependencySet>
- <outputDirectory>java8/sources</outputDirectory>
+ <outputDirectory>modules/builder/api</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-api:*:sources</include>
- <include>org.apache.tamaya:tamaya-core:*:sources</include>
+ <include>org.apache.tamaya.ext:tamaya-builder:*:javadoc</include>
</includes>
+ <unpack>true</unpack>
</dependencySet>
+ <!-- Classloader Support module -->
<dependencySet>
- <outputDirectory>java8/javadoc</outputDirectory>
+ <outputDirectory>modules/classloader-support/lib</outputDirectory>
<includes>
- <include>org.apache.tamaya:tamaya-api:*:javadoc</include>
- <include>org.apache.tamaya:tamaya-core:*:javadoc</include>
+ <include>org.apache.tamaya.ext:tamaya-classloader-support</include>
</includes>
</dependencySet>
-
- <!-- Tamaya modules -->
-
- <!-->>> Builder module -->
<dependencySet>
- <outputDirectory>modules/builder/lib</outputDirectory>
+ <outputDirectory>modules/classloader-support/api</outputDirectory>
<includes>
- <include>org.apache.tamaya.ext:tamaya-builder</include>
+ <include>org.apache.tamaya.ext:tamaya-classloader-support:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Collections module -->
+ <dependencySet>
+ <outputDirectory>modules/collections/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-collections</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>modules/builder/api</outputDirectory>
+ <outputDirectory>modules/collections/api</outputDirectory>
<includes>
- <include>org.apache.tamaya.ext:tamaya-builder:*:javadoc</include>
+ <include>org.apache.tamaya.ext:tamaya-collections:*:javadoc</include>
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Builder module -->
-
- <!-->>> Events module -->
+ <!-- Events module -->
<dependencySet>
<outputDirectory>modules/events/lib</outputDirectory>
<includes>
<include>org.apache.tamaya.ext:tamaya-events</include>
</includes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/events/api</outputDirectory>
<includes>
@@ -114,16 +114,27 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Events module -->
-
- <!-->>> Formats module -->
+ <!-- Filter module -->
+ <dependencySet>
+ <outputDirectory>modules/filter/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-filter</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/filter/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-filter:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!--Formats module -->
<dependencySet>
<outputDirectory>modules/formats/lib</outputDirectory>
<includes>
<include>org.apache.tamaya.ext:tamaya-formats</include>
</includes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/formats/api</outputDirectory>
<includes>
@@ -131,24 +142,27 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Formats module -->
-
- <!-->>> Injection module -->
+ <!--Functions module -->
+ <dependencySet>
+ <outputDirectory>modules/functions/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-functions</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/functions/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-functions:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!--Injection module -->
<dependencySet>
<outputDirectory>modules/injection/lib</outputDirectory>
<includes>
<include>org.apache.tamaya.ext:tamaya-injection</include>
- <include>org.apache.tamaya.ext:tamaya-events</include>
- <include>org.apache.tamaya.ext:tamaya-resolver</include>
</includes>
- <excludes>
- <exclude>org.apache.tamaya.ext:tamaya-events:*:javadoc</exclude>
- <exclude>org.apache.tamaya.ext:tamaya-events:*:sources</exclude>
- <exclude>org.apache.tamaya.ext:tamaya-resolver:*:javadoc</exclude>
- <exclude>org.apache.tamaya.ext:tamaya-resolver:*:sources</exclude>
- </excludes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/injection/api</outputDirectory>
<includes>
@@ -156,9 +170,22 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Injection module -->
+ <!--Injection API module -->
+ <dependencySet>
+ <outputDirectory>modules/injection-api/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-injection-api</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/injection-api/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-injection-api:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
- <!-->>> JSON module -->
+ <!-- JSON module -->
<dependencySet>
<outputDirectory>modules/json/lib</outputDirectory>
<includes>
@@ -166,7 +193,6 @@ under the License.
<include>com.fasterxml.jackson.core:*</include>
</includes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/json/api</outputDirectory>
<includes>
@@ -174,21 +200,69 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< JSON module -->
-
- <!-->>> Resolver module -->
+ <!-- Management module -->
+ <dependencySet>
+ <outputDirectory>modules/management/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-management</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/management/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-management:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Model module -->
+ <dependencySet>
+ <outputDirectory>modules/model/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-model</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/model/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-model:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- mutable config -->
+ <dependencySet>
+ <outputDirectory>modules/mutable-config/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-mutable-config</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/mutable-config/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-mutable-config:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- optional module -->
+ <dependencySet>
+ <outputDirectory>modules/optional/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-optional</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/optional/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-optional:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Resolver module -->
<dependencySet>
<outputDirectory>modules/resolver/lib</outputDirectory>
<includes>
<include>org.apache.tamaya.ext:tamaya-resolver</include>
- <include>org.apache.tamaya.ext:tamaya-resources</include>
</includes>
- <excludes>
- <exclude>org.apache.tamaya.ext:tamaya-resources:*:javadoc</exclude>
- <exclude>org.apache.tamaya.ext:tamaya-resources:*:sources</exclude>
- </excludes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/resolver/api</outputDirectory>
<includes>
@@ -196,25 +270,163 @@ under the License.
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Resolver module -->
-
- <!-->>> Resources module -->
+ <!-- Resources module -->
<dependencySet>
<outputDirectory>modules/resources/lib</outputDirectory>
<includes>
<include>org.apache.tamaya.ext:tamaya-resources</include>
</includes>
</dependencySet>
-
<dependencySet>
<outputDirectory>modules/resources/api</outputDirectory>
<includes>
- <include>org.apache.tamaya.ext:tamaya-resources:*:javadoc</include>
+ <include>org.apache.tamaya.ext:tamaya-resolver:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- Server module -->
+ <dependencySet>
+ <outputDirectory>modules/server/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-server</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/server/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-server:*:javadoc</include>
</includes>
<unpack>true</unpack>
</dependencySet>
- <!--<<< Resources module -->
+ <!-- spi-support module -->
+ <dependencySet>
+ <outputDirectory>modules/spi-support/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-spi-support</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/spi-support/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-spi-support:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- yaml module -->
+ <dependencySet>
+ <outputDirectory>modules/yaml/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-yaml</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/yaml/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-yaml:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+
+ <!-- ***** Integrations -->
+ <!-- camel module -->
+ <dependencySet>
+ <outputDirectory>modules/camel/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-camel</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/camel/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-camel:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- cdi module -->
+ <dependencySet>
+ <outputDirectory>modules/cdi/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-cdi</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/cdi/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-cdi:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- cdi-se module -->
+ <dependencySet>
+ <outputDirectory>modules/cdi-se/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-cdi-se</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/cdi-se/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-cdi-se:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- consul module -->
+ <dependencySet>
+ <outputDirectory>modules/consul/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-consul</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/consul/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-consul:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- etcd module -->
+ <dependencySet>
+ <outputDirectory>modules/etcd/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-etcd</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/etcd/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-etcd:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- osgi module -->
+ <dependencySet>
+ <outputDirectory>modules/osgi/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-osgi</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/osgi/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-osgi:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ <!-- spring module -->
+ <dependencySet>
+ <outputDirectory>modules/spring/lib</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-spring</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>modules/spring/api</outputDirectory>
+ <includes>
+ <include>org.apache.tamaya.ext:tamaya-spring:*:javadoc</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/modules/model/pom.xml
----------------------------------------------------------------------
diff --git a/modules/model/pom.xml b/modules/model/pom.xml
index c143ad4..50bc447 100644
--- a/modules/model/pom.xml
+++ b/modules/model/pom.xml
@@ -27,7 +27,6 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <groupId>org.apache.tamaya.ext.model</groupId>
<artifactId>tamaya-model</artifactId>
<name>Apache Tamaya Modules - Configuration Model Infrastructure</name>
<description>This extension module provides functionality to describe, document and
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 71154cb..d85849c 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -34,26 +34,27 @@ under the License.
<modules>
<module>builder</module>
- <module>mutable-config</module>
- <module>spi-support</module>
+ <module>classloader-support</module>
+ <module>collections</module>
<module>events</module>
+ <module>filter</module>
<module>formats</module>
- <module>injection-api</module>
+ <module>functions</module>
<module>injection</module>
+ <module>injection-api</module>
+
+ <module>integration</module>
+
<module>json</module>
- <module>yaml</module>
+ <module>management</module>
+ <module>model</module>
+ <module>mutable-config</module>
+ <module>optional</module>
<module>resolver</module>
<module>resources</module>
- <module>functions</module>
- <module>model</module>
- <module>management</module>
<module>server</module>
- <module>remote</module>
- <module>optional</module>
- <module>classloader-support</module>
- <module>integration</module>
- <module>filter</module>
- <module>collections</module>
+ <module>spi-support</module>
+ <module>yaml</module>
</modules>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/modules/remote/pom.xml
----------------------------------------------------------------------
diff --git a/modules/remote/pom.xml b/modules/remote/pom.xml
deleted file mode 100644
index e47b2bf..0000000
--- a/modules/remote/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy current the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-extensions</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>tamaya-remote</artifactId>
- <name>Apache Tamaya Modules - Remote PropertySource</name>
- <packaging>bundle</packaging>
-
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tamaya</groupId>
- <artifactId>tamaya-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tamaya-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.tamaya.remote
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/modules/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
----------------------------------------------------------------------
diff --git a/modules/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java b/modules/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
deleted file mode 100644
index 0fd1c67..0000000
--- a/modules/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tamaya.remote;
-
-import org.apache.tamaya.format.ConfigurationData;
-import org.apache.tamaya.format.ConfigurationFormat;
-import org.apache.tamaya.json.JSONFormat;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Abstract base class for implementing a PropertySource that reads configuration data from a remote resource. It uses
- * by default the JSON format as defined by the JSON module.
- */
-public abstract class BaseRemotePropertySource implements PropertySource{
-
- private static final ConfigurationFormat DEFAULT_FORMAT = new JSONFormat();
-
- private Map<String,String> properties = new HashMap<>();
-
- protected BaseRemotePropertySource(){
- reload();
- }
-
- @Override
- public String getName() {
- return getClass().getSimpleName();
- }
-
- @Override
- public Map<String, String> getProperties() {
- return properties;
- }
-
- /**
- * Reloads the remote configuration. If reloads fails to whatever reasons the already loaded configuration will
- * stay untouched.
- */
- public void reload(){
- ConfigurationFormat format = getConfigurationFormat();
- for(URL url:getAccessURLs()) {
- try(InputStream is = url.openStream()) {
- ConfigurationData data = format.readConfiguration(url.toExternalForm(), is);
- if(data!=null){
- Map<String,String> newProperties = mapConfigurationData(data);
- // the configs served by the tamaya server module has a 'data' root section containing the
- // config entries. if not present, we assume an alternate format, which is sued as is...
- if(!newProperties.isEmpty()){
- this.properties = newProperties;
- Logger.getLogger(getClass().getName()).info(
- "Reloaded remote config from: " + url + ", entries read: " + this.properties.size());
- }
- }
- }
- catch(Exception e){
- Logger.getLogger(getClass().getName()).log(Level.SEVERE, "Failed to load config from url: " + url, e);
- }
- }
- }
-
- protected abstract Collection<URL> getAccessURLs();
-
- protected ConfigurationFormat getConfigurationFormat(){
- return DEFAULT_FORMAT;
- }
-
- protected Map<String,String> mapConfigurationData(ConfigurationData data){
- Map<String,String> readProperties;
- if(data!=null){
- readProperties = data.getCombinedProperties();
- if(readProperties!=null){
- Map<String,String> newProperties = new HashMap<>();
- for(Map.Entry<String,String> en:readProperties.entrySet()){
- // filter data entries
- newProperties.put(en.getKey(), en.getValue());
- }
- // the configs served by the tamaya server module has a 'data' root section containing the
- // config entries. if not present, we assume an alternate format, which is sued as is...
- if(newProperties.isEmpty()){
- Logger.getLogger(getClass().getName()).info(
- "Loaded remote config from: " + data.getResource() + ", does not have a data section, using as is...");
- newProperties = readProperties;
- }
- Logger.getLogger(getClass().getName()).info(
- "Reloaded remote config from: " + data.getResource() + ", entriea read: " + this.properties.size());
- return newProperties;
- }
- }
- return Collections.emptyMap();
- }
-
- @Override
- public boolean isScannable(){
- return true;
- }
-
- @Override
- public PropertyValue get(String key) {
- return PropertyValue.of(key,getProperties().get(key),getName());
- }
-
- @Override
- public int getOrdinal(){
- PropertyValue configuredOrdinal = get(TAMAYA_ORDINAL);
- if(configuredOrdinal!=null){
- try{
- return Integer.parseInt(configuredOrdinal.getValue());
- } catch(Exception e){
- Logger.getLogger(getClass().getName()).log(Level.WARNING,
- "Configured Ordinal is not an int number: " + configuredOrdinal, e);
- }
- }
- return getDefaultOrdinal();
- }
-
- /**
- * Returns the default ordinal used, when no ordinal is set, or the ordinal was not parseable to an int value.
- * @return the default ordinal used, by default 0.
- */
- public int getDefaultOrdinal(){
- return 0;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/sandbox/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index ba43998..543b896 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -40,6 +40,7 @@ under the License.
<module>jodatime</module>
<module>sysprops</module>
<module>ui</module>
+ <module>remote</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/sandbox/remote/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/remote/pom.xml b/sandbox/remote/pom.xml
new file mode 100644
index 0000000..e47b2bf
--- /dev/null
+++ b/sandbox/remote/pom.xml
@@ -0,0 +1,76 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy current the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tamaya.ext</groupId>
+ <artifactId>tamaya-extensions</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>tamaya-remote</artifactId>
+ <name>Apache Tamaya Modules - Remote PropertySource</name>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <jdkVersion>1.7</jdkVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tamaya</groupId>
+ <artifactId>tamaya-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tamaya-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.tamaya.remote
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/14944e22/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
----------------------------------------------------------------------
diff --git a/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java b/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
new file mode 100644
index 0000000..0fd1c67
--- /dev/null
+++ b/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya.remote;
+
+import org.apache.tamaya.format.ConfigurationData;
+import org.apache.tamaya.format.ConfigurationFormat;
+import org.apache.tamaya.json.JSONFormat;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Abstract base class for implementing a PropertySource that reads configuration data from a remote resource. It uses
+ * by default the JSON format as defined by the JSON module.
+ */
+public abstract class BaseRemotePropertySource implements PropertySource{
+
+ private static final ConfigurationFormat DEFAULT_FORMAT = new JSONFormat();
+
+ private Map<String,String> properties = new HashMap<>();
+
+ protected BaseRemotePropertySource(){
+ reload();
+ }
+
+ @Override
+ public String getName() {
+ return getClass().getSimpleName();
+ }
+
+ @Override
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Reloads the remote configuration. If reloads fails to whatever reasons the already loaded configuration will
+ * stay untouched.
+ */
+ public void reload(){
+ ConfigurationFormat format = getConfigurationFormat();
+ for(URL url:getAccessURLs()) {
+ try(InputStream is = url.openStream()) {
+ ConfigurationData data = format.readConfiguration(url.toExternalForm(), is);
+ if(data!=null){
+ Map<String,String> newProperties = mapConfigurationData(data);
+ // the configs served by the tamaya server module has a 'data' root section containing the
+ // config entries. if not present, we assume an alternate format, which is sued as is...
+ if(!newProperties.isEmpty()){
+ this.properties = newProperties;
+ Logger.getLogger(getClass().getName()).info(
+ "Reloaded remote config from: " + url + ", entries read: " + this.properties.size());
+ }
+ }
+ }
+ catch(Exception e){
+ Logger.getLogger(getClass().getName()).log(Level.SEVERE, "Failed to load config from url: " + url, e);
+ }
+ }
+ }
+
+ protected abstract Collection<URL> getAccessURLs();
+
+ protected ConfigurationFormat getConfigurationFormat(){
+ return DEFAULT_FORMAT;
+ }
+
+ protected Map<String,String> mapConfigurationData(ConfigurationData data){
+ Map<String,String> readProperties;
+ if(data!=null){
+ readProperties = data.getCombinedProperties();
+ if(readProperties!=null){
+ Map<String,String> newProperties = new HashMap<>();
+ for(Map.Entry<String,String> en:readProperties.entrySet()){
+ // filter data entries
+ newProperties.put(en.getKey(), en.getValue());
+ }
+ // the configs served by the tamaya server module has a 'data' root section containing the
+ // config entries. if not present, we assume an alternate format, which is sued as is...
+ if(newProperties.isEmpty()){
+ Logger.getLogger(getClass().getName()).info(
+ "Loaded remote config from: " + data.getResource() + ", does not have a data section, using as is...");
+ newProperties = readProperties;
+ }
+ Logger.getLogger(getClass().getName()).info(
+ "Reloaded remote config from: " + data.getResource() + ", entriea read: " + this.properties.size());
+ return newProperties;
+ }
+ }
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public boolean isScannable(){
+ return true;
+ }
+
+ @Override
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key,getProperties().get(key),getName());
+ }
+
+ @Override
+ public int getOrdinal(){
+ PropertyValue configuredOrdinal = get(TAMAYA_ORDINAL);
+ if(configuredOrdinal!=null){
+ try{
+ return Integer.parseInt(configuredOrdinal.getValue());
+ } catch(Exception e){
+ Logger.getLogger(getClass().getName()).log(Level.WARNING,
+ "Configured Ordinal is not an int number: " + configuredOrdinal, e);
+ }
+ }
+ return getDefaultOrdinal();
+ }
+
+ /**
+ * Returns the default ordinal used, when no ordinal is set, or the ordinal was not parseable to an int value.
+ * @return the default ordinal used, by default 0.
+ */
+ public int getDefaultOrdinal(){
+ return 0;
+ }
+
+}
[3/5] incubator-tamaya git commit: Removed snapshot versions.
Posted by an...@apache.org.
Removed snapshot versions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/2c72a226
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/2c72a226
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/2c72a226
Branch: refs/heads/master
Commit: 2c72a226310e67d036138a70e5d01067467504de
Parents: ac6854b
Author: anatole <an...@apache.org>
Authored: Tue Mar 8 16:00:45 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 8 16:00:45 2016 +0100
----------------------------------------------------------------------
modules/integration/cdi-se/pom.xml | 2 +-
modules/integration/cdi/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2c72a226/modules/integration/cdi-se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/pom.xml b/modules/integration/cdi-se/pom.xml
index 231e619..57135fd 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -153,7 +153,7 @@ under the License.
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2c72a226/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 147ac9d..ea1cef6 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -160,7 +160,7 @@ under the License.
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
+ <version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
[4/5] incubator-tamaya git commit: Added release-plugin param.
Posted by an...@apache.org.
Added release-plugin param.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/2fa8b7d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/2fa8b7d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/2fa8b7d5
Branch: refs/heads/master
Commit: 2fa8b7d5dbaa7cb2460e0d2ff09cf63b6c09e30b
Parents: 2c72a22
Author: anatole <an...@apache.org>
Authored: Tue Mar 8 16:09:44 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 8 16:09:44 2016 +0100
----------------------------------------------------------------------
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2fa8b7d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae056e8..0f0d724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,6 +560,13 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>