From df19700f6981530f0ff9f863620a1fdd1d732566 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 28 May 2014 15:32:20 +0100 Subject: [PATCH] Deploy server war and dist bundles to Maven repo. Also added '-parent' to some parent poms where this was missing --- audit/tests/pom.xml | 12 ++++++++++++ authentication/authentication-api/pom.xml | 2 +- authentication/authentication-model/pom.xml | 2 +- authentication/authentication-picketlink/pom.xml | 2 +- authentication/pom.xml | 4 ++-- distribution/examples-docs-zip/pom.xml | 7 +++++++ distribution/modules/pom.xml | 7 +++++++ distribution/src-dist/pom.xml | 7 +++++++ distribution/theme-template-zip/pom.xml | 7 +++++++ distribution/war-zip/pom.xml | 7 +++++++ docbook/pom.xml | 11 +++++++++-- examples/demo-template/customer-app-cli/pom.xml | 2 +- export-import/export-import-api/pom.xml | 2 +- export-import/export-import-impl/pom.xml | 2 +- export-import/pom.xml | 2 +- forms/account-api/pom.xml | 2 +- forms/account-freemarker/pom.xml | 2 +- forms/common-freemarker/pom.xml | 2 +- forms/common-themes/pom.xml | 2 +- forms/email-api/pom.xml | 2 +- forms/email-freemarker/pom.xml | 2 +- forms/login-api/pom.xml | 2 +- forms/login-freemarker/pom.xml | 2 +- forms/pom.xml | 2 +- integration/installed/pom.xml | 2 +- integration/pom.xml | 2 +- model/tests/pom.xml | 8 +++++++- picketlink/keycloak-picketlink-api/pom.xml | 2 +- picketlink/keycloak-picketlink-realm/pom.xml | 2 +- picketlink/pom.xml | 4 ++-- server/pom.xml | 9 --------- 31 files changed, 87 insertions(+), 36 deletions(-) diff --git a/audit/tests/pom.xml b/audit/tests/pom.xml index 1b8cac1d96..e911cc2684 100755 --- a/audit/tests/pom.xml +++ b/audit/tests/pom.xml @@ -13,6 +13,18 @@ Keycloak Audit Tests + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + org.keycloak diff --git a/authentication/authentication-api/pom.xml b/authentication/authentication-api/pom.xml index 73a15d8551..86b4d421bb 100644 --- a/authentication/authentication-api/pom.xml +++ b/authentication/authentication-api/pom.xml @@ -1,7 +1,7 @@ - keycloak-authentication + keycloak-authentication-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/authentication/authentication-model/pom.xml b/authentication/authentication-model/pom.xml index 9ab46132e9..7ef68740be 100644 --- a/authentication/authentication-model/pom.xml +++ b/authentication/authentication-model/pom.xml @@ -1,7 +1,7 @@ - keycloak-authentication + keycloak-authentication-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/authentication/authentication-picketlink/pom.xml b/authentication/authentication-picketlink/pom.xml index 748c99d220..3f06db34cd 100644 --- a/authentication/authentication-picketlink/pom.xml +++ b/authentication/authentication-picketlink/pom.xml @@ -1,7 +1,7 @@ - keycloak-authentication + keycloak-authentication-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/authentication/pom.xml b/authentication/pom.xml index ac23138852..46cc7179f1 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -11,7 +11,7 @@ 4.0.0 pom - keycloak-authentication + keycloak-authentication-parent Keycloak Authentication @@ -21,4 +21,4 @@ authentication-picketlink - \ No newline at end of file + diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml index ee31f51c0c..d797a44ab3 100755 --- a/distribution/examples-docs-zip/pom.xml +++ b/distribution/examples-docs-zip/pom.xml @@ -17,6 +17,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-antrun-plugin diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml index 6aadb8dfe5..23e8c3b8d4 100755 --- a/distribution/modules/pom.xml +++ b/distribution/modules/pom.xml @@ -88,6 +88,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-antrun-plugin diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml index 95d7c12431..0e83703d99 100755 --- a/distribution/src-dist/pom.xml +++ b/distribution/src-dist/pom.xml @@ -17,6 +17,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + maven-assembly-plugin 2.4 diff --git a/distribution/theme-template-zip/pom.xml b/distribution/theme-template-zip/pom.xml index 5742cc5695..04eb5a3af9 100755 --- a/distribution/theme-template-zip/pom.xml +++ b/distribution/theme-template-zip/pom.xml @@ -17,6 +17,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-antrun-plugin diff --git a/distribution/war-zip/pom.xml b/distribution/war-zip/pom.xml index 3c75d9cb1b..1390e2468e 100755 --- a/distribution/war-zip/pom.xml +++ b/distribution/war-zip/pom.xml @@ -17,6 +17,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-dependency-plugin diff --git a/docbook/pom.xml b/docbook/pom.xml index cad69febef..629cd4c68b 100755 --- a/docbook/pom.xml +++ b/docbook/pom.xml @@ -40,6 +40,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.jboss.maven.plugins maven-jdocbook-plugin @@ -63,9 +70,9 @@ master.xml en-US - reference/en + ${project.basedir}/reference/en - reference/en + ${project.basedir}/reference/en images/* diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml index 61e903e175..87ef08edb3 100755 --- a/examples/demo-template/customer-app-cli/pom.xml +++ b/examples/demo-template/customer-app-cli/pom.xml @@ -17,7 +17,7 @@ org.keycloak - keycloak-installed + keycloak-installed-adapter ${project.version} diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml index e4ed0adda9..7f2f0fa066 100644 --- a/export-import/export-import-api/pom.xml +++ b/export-import/export-import-api/pom.xml @@ -2,7 +2,7 @@ - keycloak-export-import + keycloak-export-import-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/export-import/export-import-impl/pom.xml b/export-import/export-import-impl/pom.xml index 17a566ee7f..6ffce86a25 100644 --- a/export-import/export-import-impl/pom.xml +++ b/export-import/export-import-impl/pom.xml @@ -2,7 +2,7 @@ - keycloak-export-import + keycloak-export-import-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/export-import/pom.xml b/export-import/pom.xml index 6df4145169..caf22b78e7 100644 --- a/export-import/pom.xml +++ b/export-import/pom.xml @@ -10,7 +10,7 @@ 4.0.0 pom - keycloak-export-import + keycloak-export-import-parent Keycloak Export And Import diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml index 33658a58ff..fd6d5e41ec 100755 --- a/forms/account-api/pom.xml +++ b/forms/account-api/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml index 1c5c02afdd..90f3d4e545 100755 --- a/forms/account-freemarker/pom.xml +++ b/forms/account-freemarker/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml index f89c87bf98..668aca79da 100755 --- a/forms/common-freemarker/pom.xml +++ b/forms/common-freemarker/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index 411e96ae86..cdcb7766dd 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml index 62df27f59d..1650b21afd 100755 --- a/forms/email-api/pom.xml +++ b/forms/email-api/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml index f83f098a8f..2a1b295931 100755 --- a/forms/email-freemarker/pom.xml +++ b/forms/email-freemarker/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml index bb2a702832..e8007c1292 100755 --- a/forms/login-api/pom.xml +++ b/forms/login-api/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml index 9e512320c8..87f30a0fbd 100755 --- a/forms/login-freemarker/pom.xml +++ b/forms/login-freemarker/pom.xml @@ -2,7 +2,7 @@ - keycloak-forms + keycloak-forms-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 0f2268dbb5..a2d3028147 100755 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -10,7 +10,7 @@ 4.0.0 pom - keycloak-forms + keycloak-forms-parent Keycloak Forms diff --git a/integration/installed/pom.xml b/integration/installed/pom.xml index 09f3e1a74a..f880bd8055 100755 --- a/integration/installed/pom.xml +++ b/integration/installed/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - keycloak-installed + keycloak-installed-adapter Keycloak Installed Application diff --git a/integration/pom.xml b/integration/pom.xml index 15a2196e28..a6f8b810f3 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - integration-pom + keycloak-integration-pom pom diff --git a/model/tests/pom.xml b/model/tests/pom.xml index 87817fed9a..b9d96fe37a 100755 --- a/model/tests/pom.xml +++ b/model/tests/pom.xml @@ -162,7 +162,13 @@ - + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-jar-plugin diff --git a/picketlink/keycloak-picketlink-api/pom.xml b/picketlink/keycloak-picketlink-api/pom.xml index b23e616988..08aaf5c4ed 100644 --- a/picketlink/keycloak-picketlink-api/pom.xml +++ b/picketlink/keycloak-picketlink-api/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - keycloak-picketlink + keycloak-picketlink-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/picketlink/keycloak-picketlink-realm/pom.xml b/picketlink/keycloak-picketlink-realm/pom.xml index e82acb1b6f..fc14358dbc 100644 --- a/picketlink/keycloak-picketlink-realm/pom.xml +++ b/picketlink/keycloak-picketlink-realm/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - keycloak-picketlink + keycloak-picketlink-parent org.keycloak 1.0-beta-1-SNAPSHOT ../pom.xml diff --git a/picketlink/pom.xml b/picketlink/pom.xml index 2917578542..948d467b16 100644 --- a/picketlink/pom.xml +++ b/picketlink/pom.xml @@ -11,7 +11,7 @@ 4.0.0 pom - keycloak-picketlink + keycloak-picketlink-parent Keycloak Picketlink @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/server/pom.xml b/server/pom.xml index 21770b3416..d6f3d2effe 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -308,7 +308,6 @@ false - org.apache.maven.plugins maven-deploy-plugin @@ -316,14 +315,6 @@ true - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - -