TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
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/1d1cf72e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/1d1cf72e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/1d1cf72e Branch: refs/heads/master Commit: 1d1cf72ef18e95980602807e6d4f1e939c90a7d2 Parents: 0d13b0e Author: anatole <anat...@apache.org> Authored: Wed Aug 9 00:21:01 2017 +0200 Committer: anatole <anat...@apache.org> Committed: Wed Aug 9 00:21:01 2017 +0200 ---------------------------------------------------------------------- modules/events/pom.xml | 4 ---- modules/features/pom.xml | 4 ---- modules/filter/pom.xml | 4 ---- modules/formats/base/pom.xml | 4 ---- modules/formats/json/pom.xml | 4 ---- modules/formats/yaml/pom.xml | 1 - modules/functions/pom.xml | 4 ---- modules/injection/injection-api/pom.xml | 1 - modules/injection/standalone/pom.xml | 4 ---- modules/jndi/pom.xml | 4 ---- modules/mutable-config/pom.xml | 4 ---- modules/optional/pom.xml | 4 ---- modules/resolver/pom.xml | 4 ---- modules/resources/pom.xml | 4 ---- modules/spi-support/pom.xml | 4 ---- pom.xml | 9 ++++----- 16 files changed, 4 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/events/pom.xml ---------------------------------------------------------------------- diff --git a/modules/events/pom.xml b/modules/events/pom.xml index a9fd9ac..3ef6ff7 100644 --- a/modules/events/pom.xml +++ b/modules/events/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Event and dynamic Update Extensions</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/features/pom.xml ---------------------------------------------------------------------- diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ca1b8c3..6f15c0f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Feature Check</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/filter/pom.xml ---------------------------------------------------------------------- diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index bc8a4d6..4cf2bd6 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Adaptive Configuration Filtering</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/base/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml index 8e5ff74..aa2c660 100644 --- a/modules/formats/base/pom.xml +++ b/modules/formats/base/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Modules Formats Common</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/json/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml index 0cacc56..5f807c5 100644 --- a/modules/formats/json/pom.xml +++ b/modules/formats/json/pom.xml @@ -34,10 +34,6 @@ under the License. <packaging>jar</packaging> <inceptionYear>2015</inceptionYear> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/yaml/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml index 431c574..d5448f3 100644 --- a/modules/formats/yaml/pom.xml +++ b/modules/formats/yaml/pom.xml @@ -35,7 +35,6 @@ under the License. <inceptionYear>2016</inceptionYear> <properties> - <jdkVersion>1.7</jdkVersion> <snakeyaml.version>1.17</snakeyaml.version> </properties> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/functions/pom.xml ---------------------------------------------------------------------- diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml index 5c90633..957f3a3 100644 --- a/modules/functions/pom.xml +++ b/modules/functions/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Modules - Common Functional Extensions</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/injection-api/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml index 925db07..b5fab8d 100644 --- a/modules/injection/injection-api/pom.xml +++ b/modules/injection/injection-api/pom.xml @@ -33,7 +33,6 @@ under the License. <packaging>jar</packaging> <properties> - <jdkVersion>1.7</jdkVersion> <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version> <geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version> </properties> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/standalone/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml index aacc143..66ad0ac 100644 --- a/modules/injection/standalone/pom.xml +++ b/modules/injection/standalone/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Modules - Injection Standalone</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/jndi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml index c4e4e0e..aa115e5 100644 --- a/modules/jndi/pom.xml +++ b/modules/jndi/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya JNDI Support</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/mutable-config/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml index 740420e..55dd945 100644 --- a/modules/mutable-config/pom.xml +++ b/modules/mutable-config/pom.xml @@ -32,10 +32,6 @@ under the License. and write changes back to some property sources, files etc.</description> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/optional/pom.xml ---------------------------------------------------------------------- diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml index 8d8a163..244a230 100644 --- a/modules/optional/pom.xml +++ b/modules/optional/pom.xml @@ -35,10 +35,6 @@ under the License. considers/uses Tamaya functionality.</description> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resolver/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml index b5e0bc7..86a1c59 100644 --- a/modules/resolver/pom.xml +++ b/modules/resolver/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Resolver Services</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resources/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml index 514dc90..3506017 100644 --- a/modules/resources/pom.xml +++ b/modules/resources/pom.xml @@ -32,10 +32,6 @@ under the License. <name>Apache Tamaya Resource Services</name> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/spi-support/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml index 5e7b083..76b21ce 100644 --- a/modules/spi-support/pom.xml +++ b/modules/spi-support/pom.xml @@ -34,10 +34,6 @@ under the License. implementation.</description> <packaging>jar</packaging> - <properties> - <jdkVersion>1.7</jdkVersion> - </properties> - <dependencies> <dependency> <groupId>org.apache.tamaya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 529aace..1bd0660 100644 --- a/pom.xml +++ b/pom.xml @@ -53,11 +53,10 @@ under the License. <commons-io.version>2.5</commons-io.version> <findbugs.skip>false</findbugs.skip> - <jdkVersion>1.8</jdkVersion> <osgi.version>4.3.1</osgi.version> <osgi.compendium.version>${osgi.version}</osgi.compendium.version> - <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel> - <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel> + <maven.compile.targetLevel>1.8</maven.compile.targetLevel> + <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel> <maven.compile.optimize>false</maven.compile.optimize> <maven.compile.deprecation>true</maven.compile.deprecation> <maven.javadoc.skip>false</maven.javadoc.skip> @@ -787,8 +786,8 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>${maven.compile.sourceLevel}</source> + <target>${maven.compile.targetLevel}</target> </configuration> </plugin> <plugin>