TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
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/f30884f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f30884f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f30884f9 Branch: refs/heads/java8 Commit: f30884f9e0ec2902567fe4e823f6f87ac2c29f98 Parents: 1e2a184 Author: anatole <anat...@apache.org> Authored: Wed Aug 9 00:20:09 2017 +0200 Committer: anatole <anat...@apache.org> Committed: Wed Aug 9 00:20:09 2017 +0200 ---------------------------------------------------------------------- management/pom.xml | 4 ---- metamodel/pom.xml | 4 ---- .../apache/tamaya/osgi/InjectionKarafTest.java | 18 +++++++++--------- .../org/apache/tamaya/osgi/OSGIKarafTest.java | 12 ++++++------ pom.xml | 15 ++++++++------- remote/pom.xml | 4 ---- server/pom.xml | 1 - tamaya-sandbox.iml | 2 +- ui/pom.xml | 3 --- usagetracker/pom.xml | 4 ---- validation/pom.xml | 4 ---- vertx/pom.xml | 3 --- 12 files changed, 24 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/management/pom.xml ---------------------------------------------------------------------- diff --git a/management/pom.xml b/management/pom.xml index 1ac279a..81f64c9 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -30,10 +30,6 @@ under the License. <name>Apache Tamaya Modules - JMX 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-sandbox/blob/f30884f9/metamodel/pom.xml ---------------------------------------------------------------------- diff --git a/metamodel/pom.xml b/metamodel/pom.xml index 1f8ae92..b462590 100644 --- a/metamodel/pom.xml +++ b/metamodel/pom.xml @@ -33,10 +33,6 @@ </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-sandbox/blob/f30884f9/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java ---------------------------------------------------------------------- diff --git a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java index 14e83ed..d8a2366 100644 --- a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java +++ b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java @@ -70,7 +70,7 @@ public class InjectionKarafTest { .artifactId("tamaya-osgi-features") .type("xml") .classifier("features") - .version("0.3-incubating-SNAPSHOT"); + .version("0.4-incubating-SNAPSHOT"); return options( KarafDistributionOption.karafDistributionConfiguration() .frameworkUrl(CoreOptions.maven() @@ -94,16 +94,16 @@ public class InjectionKarafTest { "src/test/resources/org.ops4j.pax.logging.cfg")), mavenBundle("org.apache.geronimo.specs", "geronimo-annotation_1.2_spec", "1.0-alpha-1"), - mavenBundle("org.apache.tamaya", "tamaya-api", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya", "tamaya-core", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.3-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya", "tamaya-api", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya", "tamaya-core", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.4-incubating-SNAPSHOT"), // injection libs mavenBundle("org.apache.geronimo.specs", "geronimo-atinject_1.0_spec", "1.0"), - mavenBundle("org.apache.tamaya.ext", "tamaya-injection-api", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-injection", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-osgi-injection", "0.3-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-injection-api", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-injection", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-osgi-injection", "0.4-incubating-SNAPSHOT"), KarafDistributionOption.features( karafStandardRepo, "scr"), KarafDistributionOption.features( http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/OSGIKarafTest.java ---------------------------------------------------------------------- diff --git a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/OSGIKarafTest.java b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/OSGIKarafTest.java index 4cc8b90..bbbf10c 100644 --- a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/OSGIKarafTest.java +++ b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/OSGIKarafTest.java @@ -78,7 +78,7 @@ public class OSGIKarafTest { .artifactId("tamaya-osgi-features") .type("xml") .classifier("features") - .version("0.3-incubating-SNAPSHOT"); + .version("0.4-incubating-SNAPSHOT"); return options( // KarafDistributionOption.karafDistributionConfiguration() // .frameworkUrl(CoreOptions.maven() @@ -102,11 +102,11 @@ public class OSGIKarafTest { // "src/test/resources/org.ops4j.pax.logging.cfg")), mavenBundle("org.apache.geronimo.specs", "geronimo-annotation_1.2_spec", "1.0-alpha-1"), - mavenBundle("org.apache.tamaya", "tamaya-api", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya", "tamaya-core", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.3-incubating-SNAPSHOT"), - mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.3-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya", "tamaya-api", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya", "tamaya-core", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.4-incubating-SNAPSHOT"), + mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.4-incubating-SNAPSHOT"), // KarafDistributionOption.features( // karafStandardRepo, "scr"), // KarafDistributionOption.features( http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 578eac8..0078166 100644 --- a/pom.xml +++ b/pom.xml @@ -44,14 +44,13 @@ under the License. </prerequisites> <properties> - <tamaya.version>3.0-incubating-SNAPSHOT</tamaya.version> + <tamaya.version>0.4-incubating-SNAPSHOT</tamaya.version> <commons-io.version>2.5</commons-io.version> <findbugs.skip>false</findbugs.skip> - <jdkVersion>1.8</jdkVersion> <osgi.version>5.0.0</osgi.version> <!-- 4.3.1 --> <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> @@ -424,6 +423,8 @@ under the License. <version>3.5.1</version> <configuration> <debug>true</debug> + <source>${maven.compile.sourceLevel}</source> + <target>${maven.compile.targetLevel}</target> <optimize>${maven.compile.optimize}</optimize> <encoding>${project.build.sourceEncoding}</encoding> <showDeprecation>${maven.compile.deprecation}</showDeprecation> @@ -707,8 +708,8 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${jdkVersion}</source> - <target>${jdkVersion}</target> + <source>${maven.compile.sourceLevel}</source> + <target>${maven.compile.targetLevel}</target> </configuration> </plugin> <plugin> @@ -749,7 +750,7 @@ under the License. <module>camel</module> <module>propertysources</module> <!--<module>ui</module>--> - <module>osgi</module> + <!--<module>osgi</module>--> <module>management</module> <module>metamodel</module> <module>microprofile</module> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/remote/pom.xml ---------------------------------------------------------------------- diff --git a/remote/pom.xml b/remote/pom.xml index 25b6847..37f2bf5 100644 --- a/remote/pom.xml +++ b/remote/pom.xml @@ -31,10 +31,6 @@ under the License. <name>Apache Tamaya Modules - Remote PropertySource</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-sandbox/blob/f30884f9/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 5b4c0dd..ab40526 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -31,7 +31,6 @@ under the License. <packaging>jar</packaging> <properties> - <jdkVersion>1.7</jdkVersion> <tomcat.version>7.0.57</tomcat.version> </properties> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/tamaya-sandbox.iml ---------------------------------------------------------------------- diff --git a/tamaya-sandbox.iml b/tamaya-sandbox.iml index 75636dc..a0d4a1e 100644 --- a/tamaya-sandbox.iml +++ b/tamaya-sandbox.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/ui/pom.xml ---------------------------------------------------------------------- diff --git a/ui/pom.xml b/ui/pom.xml index 2835676..529f070 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -33,9 +33,6 @@ <packaging>pom</packaging> <properties> - <jdkVersion>1.8</jdkVersion> - <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel> - <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel> <vaadin.plugin.version>2.1.0</vaadin.plugin.version> <vaadin.version>8.0.4</vaadin.version> <guava.version>21.0</guava.version> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/usagetracker/pom.xml ---------------------------------------------------------------------- diff --git a/usagetracker/pom.xml b/usagetracker/pom.xml index f52516c..57dce21 100644 --- a/usagetracker/pom.xml +++ b/usagetracker/pom.xml @@ -33,10 +33,6 @@ under the License. </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-sandbox/blob/f30884f9/validation/pom.xml ---------------------------------------------------------------------- diff --git a/validation/pom.xml b/validation/pom.xml index 5fc7a5b..e3d9b79 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -32,10 +32,6 @@ </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-sandbox/blob/f30884f9/vertx/pom.xml ---------------------------------------------------------------------- diff --git a/vertx/pom.xml b/vertx/pom.xml index 4c14510..ede9c64 100644 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@ -34,9 +34,6 @@ <packaging>jar</packaging> <properties> - <jdkVersion>1.8</jdkVersion> - <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel> - <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel> <vertx.version>3.3.0</vertx.version> </properties>