From 84f1e1b56e554a1689ee515e46772167f91e1e8e Mon Sep 17 00:00:00 2001 From: Andrea Vibelli Date: Mon, 31 Mar 2014 11:17:16 +0200 Subject: [PATCH] Extraction into properties of maven-compiler-plugin source and target --- admin-ui-styles/pom.xml | 4 ++-- admin-ui/pom.xml | 4 ++-- core-jaxrs/pom.xml | 4 ++-- core/pom.xml | 4 ++-- examples/demo-template/customer-app-cli/pom.xml | 4 ++-- examples/demo-template/customer-app-js/pom.xml | 4 ++-- examples/demo-template/customer-app/pom.xml | 4 ++-- examples/demo-template/database-service/pom.xml | 4 ++-- examples/demo-template/product-app/pom.xml | 4 ++-- examples/demo-template/third-party-cdi/pom.xml | 4 ++-- examples/demo-template/third-party/pom.xml | 4 ++-- examples/js-console/pom.xml | 4 ++-- forms/account-api/pom.xml | 4 ++-- forms/account-freemarker/pom.xml | 4 ++-- forms/common-freemarker/pom.xml | 4 ++-- forms/common-themes/pom.xml | 4 ++-- forms/login-api/pom.xml | 4 ++-- forms/login-freemarker/pom.xml | 4 ++-- integration/adapter-core/pom.xml | 4 ++-- integration/as7-eap-subsystem/pom.xml | 4 ++-- integration/as7-eap6/adapter/pom.xml | 4 ++-- integration/installed/pom.xml | 4 ++-- integration/jaxrs-oauth-client/pom.xml | 4 ++-- integration/jboss-adapter-core/pom.xml | 4 ++-- integration/js/pom.xml | 4 ++-- integration/servlet-oauth-client/pom.xml | 4 ++-- integration/undertow/pom.xml | 4 ++-- integration/wildfly-adapter/pom.xml | 4 ++-- integration/wildfly-subsystem/pom.xml | 4 ++-- model/api/pom.xml | 4 ++-- model/jpa/pom.xml | 4 ++-- model/mongo/pom.xml | 4 ++-- model/picketlink/pom.xml | 4 ++-- pom.xml | 13 +++++++++---- server/pom.xml | 4 ++-- services/pom.xml | 4 ++-- spi/authentication-model/pom.xml | 4 ++-- spi/authentication-picketlink/pom.xml | 4 ++-- spi/authentication-spi/pom.xml | 4 ++-- testsuite/integration/pom.xml | 4 ++-- testsuite/performance/pom.xml | 4 ++-- 41 files changed, 89 insertions(+), 84 deletions(-) diff --git a/admin-ui-styles/pom.xml b/admin-ui-styles/pom.xml index b22b9e9886..442de9b3ea 100755 --- a/admin-ui-styles/pom.xml +++ b/admin-ui-styles/pom.xml @@ -22,8 +22,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/admin-ui/pom.xml b/admin-ui/pom.xml index 4672fe7a85..ddcfd21dbb 100755 --- a/admin-ui/pom.xml +++ b/admin-ui/pom.xml @@ -22,8 +22,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/core-jaxrs/pom.xml b/core-jaxrs/pom.xml index 8002677ac3..2ca0392b71 100755 --- a/core-jaxrs/pom.xml +++ b/core-jaxrs/pom.xml @@ -62,8 +62,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/core/pom.xml b/core/pom.xml index 3b1b7897d0..2d4b51f181 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -46,8 +46,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml index 363bc3ea93..ac8ffb3989 100755 --- a/examples/demo-template/customer-app-cli/pom.xml +++ b/examples/demo-template/customer-app-cli/pom.xml @@ -43,8 +43,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/customer-app-js/pom.xml b/examples/demo-template/customer-app-js/pom.xml index 0b75bb3825..d230c4194f 100755 --- a/examples/demo-template/customer-app-js/pom.xml +++ b/examples/demo-template/customer-app-js/pom.xml @@ -33,8 +33,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml index 34cfa9fc23..f35553bac1 100755 --- a/examples/demo-template/customer-app/pom.xml +++ b/examples/demo-template/customer-app/pom.xml @@ -67,8 +67,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml index ebf0afcfeb..f85e1c5a52 100755 --- a/examples/demo-template/database-service/pom.xml +++ b/examples/demo-template/database-service/pom.xml @@ -78,8 +78,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml index f5c5ca443c..0b4b6f4c8b 100755 --- a/examples/demo-template/product-app/pom.xml +++ b/examples/demo-template/product-app/pom.xml @@ -72,8 +72,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml index e98f7fe133..ab1d5ad552 100755 --- a/examples/demo-template/third-party-cdi/pom.xml +++ b/examples/demo-template/third-party-cdi/pom.xml @@ -83,8 +83,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml index 5142f7b56a..0b2b478da6 100755 --- a/examples/demo-template/third-party/pom.xml +++ b/examples/demo-template/third-party/pom.xml @@ -65,8 +65,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/examples/js-console/pom.xml b/examples/js-console/pom.xml index 1e8dc6a0f8..9c1ca74971 100755 --- a/examples/js-console/pom.xml +++ b/examples/js-console/pom.xml @@ -33,8 +33,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml index 18c9a4507d..e153d52f0d 100755 --- a/forms/account-api/pom.xml +++ b/forms/account-api/pom.xml @@ -40,8 +40,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml index 25bec53b28..c438fedd09 100755 --- a/forms/account-freemarker/pom.xml +++ b/forms/account-freemarker/pom.xml @@ -61,8 +61,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml index 220065b90e..eaac9f3c9e 100755 --- a/forms/common-freemarker/pom.xml +++ b/forms/common-freemarker/pom.xml @@ -45,8 +45,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index 43dfba6760..cb1d6f9673 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -45,8 +45,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml index 0aa0e937b8..9b44836f0b 100755 --- a/forms/login-api/pom.xml +++ b/forms/login-api/pom.xml @@ -40,8 +40,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml index 4611ac11a4..d1cc8294f7 100755 --- a/forms/login-freemarker/pom.xml +++ b/forms/login-freemarker/pom.xml @@ -66,8 +66,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml index 4e7ac1aed8..9a57dbacb5 100755 --- a/integration/adapter-core/pom.xml +++ b/integration/adapter-core/pom.xml @@ -59,8 +59,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/as7-eap-subsystem/pom.xml b/integration/as7-eap-subsystem/pom.xml index c21ba32550..8c8f472d36 100755 --- a/integration/as7-eap-subsystem/pom.xml +++ b/integration/as7-eap-subsystem/pom.xml @@ -34,8 +34,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml index 3aa8a884e2..eaa83deb1b 100755 --- a/integration/as7-eap6/adapter/pom.xml +++ b/integration/as7-eap6/adapter/pom.xml @@ -89,8 +89,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/installed/pom.xml b/integration/installed/pom.xml index 862cc90a75..09f3e1a74a 100755 --- a/integration/installed/pom.xml +++ b/integration/installed/pom.xml @@ -53,8 +53,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/jaxrs-oauth-client/pom.xml b/integration/jaxrs-oauth-client/pom.xml index ea70d6c967..f4243d8add 100755 --- a/integration/jaxrs-oauth-client/pom.xml +++ b/integration/jaxrs-oauth-client/pom.xml @@ -62,8 +62,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml index 68afdc80f9..42ec33603a 100755 --- a/integration/jboss-adapter-core/pom.xml +++ b/integration/jboss-adapter-core/pom.xml @@ -74,8 +74,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/js/pom.xml b/integration/js/pom.xml index 827c6cb2dd..fdfc8a3045 100755 --- a/integration/js/pom.xml +++ b/integration/js/pom.xml @@ -22,8 +22,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/servlet-oauth-client/pom.xml b/integration/servlet-oauth-client/pom.xml index 0a7189ec2c..68b0f81e96 100755 --- a/integration/servlet-oauth-client/pom.xml +++ b/integration/servlet-oauth-client/pom.xml @@ -59,8 +59,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml index aa66f0ebf7..44c6a0a76e 100755 --- a/integration/undertow/pom.xml +++ b/integration/undertow/pom.xml @@ -83,8 +83,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/wildfly-adapter/pom.xml b/integration/wildfly-adapter/pom.xml index 243e864fd4..e563cefc06 100755 --- a/integration/wildfly-adapter/pom.xml +++ b/integration/wildfly-adapter/pom.xml @@ -99,8 +99,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/integration/wildfly-subsystem/pom.xml b/integration/wildfly-subsystem/pom.xml index 960357485d..7c006b6cdf 100755 --- a/integration/wildfly-subsystem/pom.xml +++ b/integration/wildfly-subsystem/pom.xml @@ -34,8 +34,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/model/api/pom.xml b/model/api/pom.xml index 5cd22080e8..fbcfd5336e 100755 --- a/model/api/pom.xml +++ b/model/api/pom.xml @@ -41,8 +41,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index ff03db0508..0fec0afa0b 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -87,8 +87,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml index 1436419bf7..53a4687480 100755 --- a/model/mongo/pom.xml +++ b/model/mongo/pom.xml @@ -75,8 +75,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/model/picketlink/pom.xml b/model/picketlink/pom.xml index 9cc6e02be7..d2250f8913 100755 --- a/model/picketlink/pom.xml +++ b/model/picketlink/pom.xml @@ -67,8 +67,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/pom.xml b/pom.xml index 5246554097..ddd5c9c253 100755 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,11 @@ 7.1.1.Final 8.0.0.Final 20131018 + + + 1.6 + 1.6 + http://keycloak.org @@ -437,8 +442,8 @@ maven-compiler-plugin 2.3.1 - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} utf-8 @@ -523,8 +528,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} utf-8 diff --git a/server/pom.xml b/server/pom.xml index b3baaf41b0..70c6894094 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -225,8 +225,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/services/pom.xml b/services/pom.xml index 0c19a7c66a..414365dcc5 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -160,8 +160,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/spi/authentication-model/pom.xml b/spi/authentication-model/pom.xml index 9a30d3a109..fa521a4f74 100644 --- a/spi/authentication-model/pom.xml +++ b/spi/authentication-model/pom.xml @@ -64,8 +64,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/spi/authentication-picketlink/pom.xml b/spi/authentication-picketlink/pom.xml index ce78e8d5dc..d0b5dcf203 100644 --- a/spi/authentication-picketlink/pom.xml +++ b/spi/authentication-picketlink/pom.xml @@ -85,8 +85,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/spi/authentication-spi/pom.xml b/spi/authentication-spi/pom.xml index 1c822e4d0b..cbaee59e8f 100644 --- a/spi/authentication-spi/pom.xml +++ b/spi/authentication-spi/pom.xml @@ -38,8 +38,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index d59a11b6a0..c5b53e73d8 100755 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -322,8 +322,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml index da21ebc8f5..8480c5981e 100755 --- a/testsuite/performance/pom.xml +++ b/testsuite/performance/pom.xml @@ -78,8 +78,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target}