You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/10/21 19:57:24 UTC
[1/4] incubator-tamaya-extensions git commit: TAMAYA-294: Update
dependencies
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master bf6ca7391 -> 7184ac59e
TAMAYA-294: Update dependencies
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/91a487c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/91a487c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/91a487c3
Branch: refs/heads/master
Commit: 91a487c3454f52ea767218e280fb1d99f8968073
Parents: 530b327
Author: Phil Ottlinger <po...@apache.org>
Authored: Sat Oct 21 20:25:49 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Sat Oct 21 20:25:49 2017 +0200
----------------------------------------------------------------------
modules/osgi/pom.xml | 2 +-
pom.xml | 25 ++++++++++++-------------
running-mutation-tests.adoc | 14 ++++++++------
3 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91a487c3/modules/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index 0bcc741..8421c28 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>2.20.1</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91a487c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 034dde2..1a8d5b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@ under the License.
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</groupId>
<artifactId>apache</artifactId>
@@ -59,14 +58,13 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<json.spec.version>1.0-alpha-1</json.spec.version>
- <johnzon.version>0.9-incubating</johnzon.version>
+ <johnzon.version>1.1.4</johnzon.version>
<junit.version>4.12</junit.version>
- <!-- last version compatible with Java 7 -->
- <assertj.version>2.8.0</assertj.version>
+ <assertj.version>3.8.0</assertj.version>
<!-- Dependency and plugin relate version properties go here -->
<arquillian.version>1.1.7.Final</arquillian.version>
- <arquillian.deamon.version>1.0.0.Alpha1</arquillian.deamon.version>
+ <arquillian.daemon.version>1.0.0.Alpha1</arquillian.daemon.version>
<!-- Keep the JRuby version in sync with the one used by Asciidoctor -->
<asciidoctor.version>1.5.2</asciidoctor.version>
@@ -290,42 +288,42 @@ under the License.
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-container-managed</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-container-common</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-main</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-protocol-arquillian</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-protocol-wire</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.daemon</groupId>
<artifactId>arquillian-daemon-server</artifactId>
- <version>${arquillian.deamon.version}</version>
+ <version>${arquillian.daemon.version}</version>
<scope>test</scope>
</dependency>
@@ -462,7 +460,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.7.0</version>
<configuration>
<debug>true</debug>
<optimize>${maven.compile.optimize}</optimize>
@@ -714,7 +712,7 @@ under the License.
<version>3.0.5</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.7,)</version>
+ <version>1.8</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -808,6 +806,7 @@ under the License.
<profile>
<id>coverage</id>
<build>
+ <defaultGoal>install org.pitest:pitest-maven:mutationCoverage</defaultGoal>
<plugins>
<plugin>
<groupId>org.pitest</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91a487c3/running-mutation-tests.adoc
----------------------------------------------------------------------
diff --git a/running-mutation-tests.adoc b/running-mutation-tests.adoc
index eba88b3..818f707 100644
--- a/running-mutation-tests.adoc
+++ b/running-mutation-tests.adoc
@@ -1,18 +1,20 @@
= How to run mutation tests
-The Tamaya Extensions projects supports
+The Tamaya Extensions project supports
https://en.wikipedia.org/wiki/Mutation_testing[mutation testing^] by
the integration of http://pitest.org/quickstart/maven/[PIT^]
-to validate the quality and effectivness of our tests.
+to validate the quality and effectiveness of our tests.
== Running PIT
-PIT is not part of the normal build process of Tamaya Extensions. Therefor it must
-be executed manually by executing the following command.
+PIT is not part of the normal build process of Tamaya Extensions. Therefore it must
+be executed manually by executing the following command:
-[source]
+[source:bash]
----
-> mvn install org.pitest:pitest-maven:mutationCoverage
+$ mvn -Pcoverage
+or
+$ mvn install org.pitest:pitest-maven:mutationCoverage
----
[2/4] incubator-tamaya-extensions git commit: Merge branch 'master'
of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions
Posted by po...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions
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/ae6caa7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/ae6caa7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/ae6caa7a
Branch: refs/heads/master
Commit: ae6caa7a06411e7b2d82fe5c7f170863d9ebcfa4
Parents: 91a487c bf6ca73
Author: Phil Ottlinger <po...@apache.org>
Authored: Sat Oct 21 20:26:24 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Sat Oct 21 20:26:24 2017 +0200
----------------------------------------------------------------------
modules/microprofile/pom.xml | 8 ++++
.../microprofile/TamayaPropertySource.java | 2 +-
.../microprofile/MicroprofileConverterTest.java | 42 ++++++++++++++++
.../MicroprofileDefaultPropertiesTest.java | 32 +++++++++++++
.../microprofile/TamayaPropertySourceTest.java | 50 ++++++++++++++++++++
pom.xml | 2 +-
6 files changed, 134 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/ae6caa7a/pom.xml
----------------------------------------------------------------------
[3/4] incubator-tamaya-extensions git commit: TAMAYA-294: Change
order of modules
Posted by po...@apache.org.
TAMAYA-294: Change order of modules
To see injection failures after all other modules ran through
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/8d38122f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/8d38122f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/8d38122f
Branch: refs/heads/master
Commit: 8d38122fa1280d7169e088cf2372d6a1e7d4d0cf
Parents: ae6caa7
Author: Phil Ottlinger <po...@apache.org>
Authored: Sat Oct 21 20:26:46 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Sat Oct 21 20:26:46 2017 +0200
----------------------------------------------------------------------
modules/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/8d38122f/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index fafe1f9..f5d9ffc 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -39,7 +39,6 @@ under the License.
<module>events</module>
<module>filter</module>
<module>formats</module>
- <module>injection</module>
<module>mutable-config</module>
<module>resolver</module>
<module>resources</module>
@@ -47,6 +46,7 @@ under the License.
<module>jndi</module>
<module>osgi</module>
<module>microprofile</module>
+ <module>injection</module>
</modules>
</project>
[4/4] incubator-tamaya-extensions git commit: TAMAYA-294: Add unicode
test case, update deps
Posted by po...@apache.org.
TAMAYA-294: Add unicode test case, update deps
Johnzon update does not work and Injection tests fail locally as on Jenkins
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/7184ac59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/7184ac59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/7184ac59
Branch: refs/heads/master
Commit: 7184ac59ec974b62a463ff111890cc6ed99a8330
Parents: 8d38122
Author: Phil Ottlinger <po...@apache.org>
Authored: Sat Oct 21 21:56:57 2017 +0200
Committer: Phil Ottlinger <po...@apache.org>
Committed: Sat Oct 21 21:56:57 2017 +0200
----------------------------------------------------------------------
.../yaml/CommonJSONTestCaseCollection.java | 54 ++++++++++++--------
.../tamaya/yaml/JSONPropertySourceTest.java | 13 +++--
.../src/test/resources/configs/valid/kanji.json | 21 ++++++++
pom.xml | 3 +-
4 files changed, 62 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/7184ac59/modules/formats/json/src/test/java/org/apache/tamaya/yaml/CommonJSONTestCaseCollection.java
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/CommonJSONTestCaseCollection.java b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/CommonJSONTestCaseCollection.java
index 1d93d20..e1f94cf 100644
--- a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/CommonJSONTestCaseCollection.java
+++ b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/CommonJSONTestCaseCollection.java
@@ -18,7 +18,15 @@
*/
package org.apache.tamaya.yaml;
-import org.apache.tamaya.ConfigException;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.URL;
+
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValue;
import org.apache.tamaya.spisupport.PropertySourceComparator;
@@ -26,16 +34,6 @@ import org.hamcrest.CoreMatchers;
import org.hamcrest.Matchers;
import org.junit.Test;
-import java.io.IOException;
-import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertTrue;
-
/**
* Class with a collection of common test cases each JSON processing
* class must be able to pass.
@@ -46,7 +44,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test
public void canReadNonLatinCharacters() throws Exception {
- URL configURL = JSONPropertySourceTest.class
+ URL configURL = CommonJSONTestCaseCollection.class
.getResource("/configs/valid/cyrillic.json");
assertThat(configURL, Matchers.notNullValue());
@@ -60,8 +58,22 @@ public abstract class CommonJSONTestCaseCollection {
}
@Test
+ public void canReadUnicodeCharacters() throws Exception {
+ URL configURL = CommonJSONTestCaseCollection.class
+ .getResource("/configs/valid/kanji.json");
+
+ assertThat(configURL, Matchers.notNullValue());
+
+ PropertySource propertySource = getPropertiesFrom(configURL);
+
+ assertThat(propertySource.get("onamae"), Matchers.notNullValue());
+ // 霊屋 = Tamaya
+ assertThat(propertySource.get("onamae").getValue(), equalTo("\u970a\u5c4b"));
+ }
+
+ @Test
public void canReadNestedStringOnlyJSONConfigFile2() throws Exception {
- URL configURL = JSONPropertySourceTest.class
+ URL configURL = CommonJSONTestCaseCollection.class
.getResource("/configs/valid/simple-nested-string-only-config-1.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -85,7 +97,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test
public void canReadNestedStringOnlyJSONConfigFileWithObjectInTheMiddle()
throws Exception {
- URL configURL = JSONPropertySourceTest.class
+ URL configURL = CommonJSONTestCaseCollection.class
.getResource("/configs/valid/simple-nested-string-only-config-2.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -111,7 +123,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test(expected = IOException.class)
public void canHandleIllegalJSONFileWhichContainsAnArray() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/invalid/with-array.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/invalid/with-array.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -120,7 +132,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test(expected = IOException.class)
public void canHandleIllegalJSONFileConsistingOfOneOpeningBracket() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/invalid/only-opening-bracket.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/invalid/only-opening-bracket.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -129,7 +141,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test(expected = IOException.class)
public void canHandleIllegalJSONFileWhichIsEmpty() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/invalid/empty-file.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/invalid/empty-file.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -138,7 +150,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test
public void priorityInConfigFileOverwriteExplicitlyGivenPriority() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/valid/with-explicit-priority.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/valid/with-explicit-priority.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -149,7 +161,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test
public void canReadFlatStringOnlyJSONConfigFile() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/valid/simple-flat-string-only-config.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/valid/simple-flat-string-only-config.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -171,7 +183,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test(expected = IOException.class)
public void emptyJSONFileResultsInConfigException() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/invalid/empty-file.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/invalid/empty-file.json");
assertThat(configURL, CoreMatchers.notNullValue());
@@ -182,7 +194,7 @@ public abstract class CommonJSONTestCaseCollection {
@Test
public void canHandleEmptyJSONObject() throws Exception {
- URL configURL = JSONPropertySourceTest.class.getResource("/configs/valid/empty-object-config.json");
+ URL configURL = CommonJSONTestCaseCollection.class.getResource("/configs/valid/empty-object-config.json");
assertThat(configURL, CoreMatchers.notNullValue());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/7184ac59/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONPropertySourceTest.java b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONPropertySourceTest.java
index e2cd404..0555bb8 100644
--- a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONPropertySourceTest.java
+++ b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONPropertySourceTest.java
@@ -18,17 +18,16 @@
*/
package org.apache.tamaya.yaml;
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.json.JSONPropertySource;
-import org.apache.tamaya.spi.PropertySource;
-import org.hamcrest.CoreMatchers;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.net.URL;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import org.apache.tamaya.json.JSONPropertySource;
+import org.apache.tamaya.spi.PropertySource;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
public class JSONPropertySourceTest extends CommonJSONTestCaseCollection {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/7184ac59/modules/formats/json/src/test/resources/configs/valid/kanji.json
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/test/resources/configs/valid/kanji.json b/modules/formats/json/src/test/resources/configs/valid/kanji.json
new file mode 100644
index 0000000..3ba1b77
--- /dev/null
+++ b/modules/formats/json/src/test/resources/configs/valid/kanji.json
@@ -0,0 +1,21 @@
+/*
+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.
+*/
+{
+ "onamae" : "霊屋"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/7184ac59/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f5ea9f5..0b7497d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,8 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<json.spec.version>1.0-alpha-1</json.spec.version>
- <johnzon.version>1.1.4</johnzon.version>
+ <!--johnzon.version>1.1.4</johnzon.version-->
+ <johnzon.version>0.9-incubating</johnzon.version>
<junit.version>4.12</junit.version>
<assertj.version>3.8.0</assertj.version>