Jenkins build is still unstable: Tamaya-Sandbox-Master #581

2017-05-01 Thread Apache Jenkins Server
See 




Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #581

2017-05-01 Thread Apache Jenkins Server
See 




Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #580

2017-05-01 Thread Apache Jenkins Server
See 




Jenkins build is still unstable: Tamaya-Sandbox-Master #580

2017-05-01 Thread Apache Jenkins Server
See 




incubator-tamaya-sandbox git commit: TAMAYA-145: Using beanshell for expression evaluation.

2017-05-01 Thread anatole
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 855230b79 -> 9731be7d5


TAMAYA-145: Using beanshell for expression evaluation.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/9731be7d
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/9731be7d
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/9731be7d

Branch: refs/heads/master
Commit: 9731be7d5cd6192ab4337da53c741601f7132362
Parents: 855230b
Author: anatole 
Authored: Mon May 1 22:23:11 2017 +0200
Committer: anatole 
Committed: Mon May 1 22:23:29 2017 +0200

--
 metamodel/pom.xml   |   5 +
 .../tamaya/metamodel/EnabledPropertySource.java |  23 +---
 .../internal/resolver/JavaResolver.java | 124 ---
 .../internal/resolver/JavaResolverTest.java |  52 +---
 metamodel/src/test/resources/tamaya-config.xml  |  13 +-
 5 files changed, 132 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9731be7d/metamodel/pom.xml
--
diff --git a/metamodel/pom.xml b/metamodel/pom.xml
index 0cfc48d..bfffea8 100644
--- a/metamodel/pom.xml
+++ b/metamodel/pom.xml
@@ -78,6 +78,11 @@
 provided
 true
 
+
+org.apache-extras.beanshell
+bsh
+2.0b6
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9731be7d/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
--
diff --git 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
 
b/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
index 7e04499..2dcf101 100644
--- 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
+++ 
b/metamodel/src/main/java/org/apache/tamaya/metamodel/EnabledPropertySource.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tamaya.metamodel;
 
+import org.apache.tamaya.metamodel.internal.resolver.JavaResolver;
 import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spisupport.PropertySourceComparator;
@@ -42,6 +43,7 @@ public final class EnabledPropertySource
 private String enabledExpression;
 private PropertySource wrapped;
 private boolean enabled;
+private static final JavaResolver resolver = new JavaResolver();
 
 public EnabledPropertySource(PropertySource wrapped, Map 
context, String expression) {
 this.enabledExpression = Objects.requireNonNull(expression);
@@ -51,25 +53,8 @@ public final class EnabledPropertySource
 
 protected boolean calculateEnabled(Map context) {
 try {
-ScriptEngineManager manager = new ScriptEngineManager();
-ScriptEngine engine = manager.getEngineByName("nashorn");
-if(engine==null){
-engine = manager.getEngineByName("rhino");
-}
-// init script engine
-for(Map.Entry entry: context.entrySet()) {
-engine.put(entry.getKey(), entry.getValue());
-}
-Object o = engine.eval(enabledExpression);
-if(!(o instanceof Boolean)){
-LOG.severe("Enabled expression must evaluate to Boolean: '"
-+enabledExpression+"', but was " + o +
-", property source will be disabled: " +
-wrapped.getName());
-return false;
-}
-return (Boolean)o;
-} catch (ScriptException e) {
+return Boolean.TRUE.equals(resolver.evaluate(enabledExpression, 
context));
+} catch (Exception e) {
 LOG.severe("Invalid Boolean expression: '"
 +enabledExpression+"': " + e + ", property source will be 
disabled: " +
 wrapped.getName());

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9731be7d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java
--
diff --git 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java
 
b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java
index 22d8618..2739da9 100644
--- 
a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java
+++ 

[1/2] incubator-tamaya-extensions git commit: [TAMAYA-266] Don't generate source and default jar for the distribution module.

2017-05-01 Thread plexus
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/issues/tamaya-265 99e42e55e -> 8f5ee61ca


[TAMAYA-266] Don't generate source and default jar for the distribution module.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/066c1d3a
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/066c1d3a
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/066c1d3a

Branch: refs/heads/issues/tamaya-265
Commit: 066c1d3ae4a9865dd73e25422d1888573877402d
Parents: 99e42e5
Author: Oliver B. Fischer 
Authored: Mon May 1 20:09:17 2017 +0200
Committer: Oliver B. Fischer 
Committed: Mon May 1 20:09:17 2017 +0200

--
 distribution/pom.xml | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/066c1d3a/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6212a62..d5d1d34 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -33,6 +33,16 @@ under the License.
 Apache Tamaya Extension Distribution
 2015
 
+
+
+true
+
+
 
 
 
@@ -590,6 +600,28 @@ under the License.
 
 
 org.apache.maven.plugins
+maven-jar-plugin
+
+
+default-jar
+
+none
+
+true
+
+false
+
+
+
+
+
+
+org.apache.maven.plugins
 maven-dependency-plugin
 
 



[2/2] incubator-tamaya-extensions git commit: [TAMAYA-269] Updated the Maven Assembly Plugin. (2.6 -> 3.0.0)

2017-05-01 Thread plexus
[TAMAYA-269] Updated the Maven Assembly Plugin. (2.6 -> 3.0.0)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/8f5ee61c
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8f5ee61c
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8f5ee61c

Branch: refs/heads/issues/tamaya-265
Commit: 8f5ee61ca34f2d1bfa6cd3a8eea61c0e2c5ed722
Parents: 066c1d3
Author: Oliver B. Fischer 
Authored: Mon May 1 20:37:02 2017 +0200
Committer: Oliver B. Fischer 
Committed: Mon May 1 20:37:02 2017 +0200

--
 distribution/pom.xml | 14 ++
 pom.xml  |  6 ++
 2 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8f5ee61c/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d5d1d34..3c16b12 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -652,8 +652,11 @@ under the License.
 single
 
 
-
apache-tamaya-${project.version}
-
src/main/assembly/distribution-bin.xml
+false
+
apache-${project.artifactId}-${project.version}-bin
+
+
src/main/assembly/distribution-bin.xml
+
 
 
 
@@ -663,8 +666,11 @@ under the License.
 single
 
 
-
apache-tamaya-${project.version}
-
src/main/assembly/distribution-src.xml
+false
+
apache-${project.artifactId}-${project.version}-src
+
+
src/main/assembly/distribution-src.xml
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8f5ee61c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index beb1ac7..acb9fd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@ under the License.
 1.5.2
 1.2.1
 1.5.2
+3.0.0
 2.15
 1.4.1
 1.0.7
@@ -366,6 +367,11 @@ under the License.
 gem-maven-plugin
 ${gem.plugin}
 
+
+org.apache.maven.plugins
+maven-assembly-plugin
+${assembly.version}
+
 
 
 org.apache.maven.plugins



[incubator-tamaya-extensions] Git Push Summary

2017-05-01 Thread plexus
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/issues/tamaya-265 [created] 99e42e55e


[1/2] incubator-tamaya-extensions git commit: [TAMAYA-231] There are only PPMC during podling.

2017-05-01 Thread plexus
Repository: incubator-tamaya-extensions
Updated Branches:
  refs/heads/master 884232cee -> 256c80491


[TAMAYA-231] There are only PPMC during podling.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/4e1dbc08
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4e1dbc08
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4e1dbc08

Branch: refs/heads/master
Commit: 4e1dbc08a5dfe484da8191b985f82672e0e460f5
Parents: 884232c
Author: Oliver B. Fischer 
Authored: Thu Apr 6 23:36:54 2017 +0200
Committer: Oliver B. Fischer 
Committed: Mon May 1 17:20:43 2017 +0200

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4e1dbc08/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 65dae92..beb1ac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@ under the License.
 anatole
 anatole -at- apache.org
 
-PMC
+PPMC
 
 +1
 
@@ -171,7 +171,7 @@ under the License.
 IRIAN.at, Austria
 http://www.irian.at/
 
-PMC
+PPMC
 
 +1
 
@@ -181,7 +181,7 @@ under the License.
 John D. Ament
 johndament at apache.org
 
-PMC
+PPMC
 
 -5
 
@@ -190,7 +190,7 @@ under the License.
 plexus
 Oliver B. Fischer
 
-PMC
+PPMC
 
 ple...@apache.org
 +1
@@ -200,7 +200,7 @@ under the License.
 pottlinger
 Phil Ottlinger
 
-PMC
+PPMC
 
 pottlinger at apache.org
 +1



[2/2] incubator-tamaya-extensions git commit: [TAMAYA-265] Upgraded the assembly descriptor used to build the binary and source distribution to version 2.0.0.

2017-05-01 Thread plexus
[TAMAYA-265] Upgraded the assembly descriptor used to build the binary and 
source distribution to version 2.0.0.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/256c8049
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/256c8049
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/256c8049

Branch: refs/heads/master
Commit: 256c804912b5d5c01017851494229604b0d5d576
Parents: 4e1dbc0
Author: Oliver B. Fischer 
Authored: Mon May 1 18:06:03 2017 +0200
Committer: Oliver B. Fischer 
Committed: Mon May 1 18:06:03 2017 +0200

--
 distribution/src/main/assembly/distribution-bin.xml | 5 ++---
 distribution/src/main/assembly/distribution-src.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/256c8049/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 3f086f4..cfb35c5 100644
--- a/distribution/src/main/assembly/distribution-bin.xml
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -16,10 +16,9 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3;
+http://maven.apache.org/ASSEMBLY/2.0.0;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
-  http://maven.apache.org/xsd/assembly-1.1.3.xsd;>
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
 
 distribution-bin
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/256c8049/distribution/src/main/assembly/distribution-src.xml
--
diff --git a/distribution/src/main/assembly/distribution-src.xml 
b/distribution/src/main/assembly/distribution-src.xml
index 87af686..afdef59 100644
--- a/distribution/src/main/assembly/distribution-src.xml
+++ b/distribution/src/main/assembly/distribution-src.xml
@@ -16,10 +16,9 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3;
+http://maven.apache.org/ASSEMBLY/2.0.0;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
-  http://maven.apache.org/xsd/assembly-1.1.3.xsd;>
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
 
 distribution-src
 



Jenkins build is still unstable: Tamaya-Sandbox-Master #579

2017-05-01 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: Tamaya-Sandbox-Master » Apache Tamaya :: OSGi Integration :: ConfigAdmin #579

2017-05-01 Thread Apache Jenkins Server
See