From 34e84c7ada275e73543b6b0e93548bce22cf46c0 Mon Sep 17 00:00:00 2001 From: Ronny Winkler Date: Mon, 15 Aug 2016 15:43:06 +0200 Subject: [PATCH] [BM] release preparation for version 3.4 --- build/ear/pom.xml | 2 +- build/installation-package-assembly/pom.xml | 2 +- build/war-parent/pom.xml | 2 +- build/war-standalone/pom.xml | 2 +- communote/api/pom.xml | 2 +- communote/commons/pom.xml | 2 +- communote/core/pom.xml | 2 +- communote/parent/pom.xml | 2 +- communote/persistence/pom.xml | 2 +- .../communote-activity-base-plugin/pom.xml | 2 +- .../communote-activity-core-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../communote-bookmarklet-plugin/pom.xml | 2 +- .../communote-confluence-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../plugins/communote-core-plugin/pom.xml | 2 +- .../plugins/communote-embed-plugin/pom.xml | 2 +- .../plugins/communote-html-client/pom.xml | 2 +- .../plugins/communote-ldap-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../communote-plugins-mq-adapter-jms/pom.xml | 2 +- .../communote-plugins-mq-message-core/pom.xml | 2 +- .../communote-plugins-mq-message/pom.xml | 2 +- .../communote-plugins-mq-parent/pom.xml | 2 +- .../pom.xml | 2 +- .../communote-plugins-mq-service/pom.xml | 2 +- .../plugins/communote-message-queue/pom.xml | 2 +- .../producer-test-project/pom.xml | 2 +- .../plugins/communote-plugins-parent/pom.xml | 2 +- .../plugins/communote-smileys-plugin/pom.xml | 2 +- .../communote-webservice-core-plugin/pom.xml | 2 +- communote/plugins/pom.xml | 2 +- communote/plugins/rest-api/1.3/client/pom.xml | 2 +- communote/plugins/rest-api/1.3/doc/pom.xml | 2 +- .../rest-api/1.3/implementation/pom.xml | 2 +- .../rest-api/1.3/model-generator/pom.xml | 2 +- communote/plugins/rest-api/1.3/model/pom.xml | 2 +- communote/plugins/rest-api/1.3/pom.xml | 2 +- communote/plugins/rest-api/2.2/client/pom.xml | 2 +- communote/plugins/rest-api/2.2/doc/pom.xml | 2 +- .../rest-api/2.2/implementation/pom.xml | 2 +- .../rest-api/2.2/model-generator/pom.xml | 2 +- communote/plugins/rest-api/2.2/model/pom.xml | 2 +- communote/plugins/rest-api/2.2/pom.xml | 2 +- communote/plugins/rest-api/2.4/client/pom.xml | 2 +- communote/plugins/rest-api/2.4/doc/pom.xml | 2 +- .../rest-api/2.4/implementation/pom.xml | 2 +- .../rest-api/2.4/model-generator/pom.xml | 2 +- communote/plugins/rest-api/2.4/model/pom.xml | 2 +- communote/plugins/rest-api/2.4/pom.xml | 2 +- communote/plugins/rest-api/3.0/client/pom.xml | 2 +- communote/plugins/rest-api/3.0/doc/pom.xml | 2 +- .../rest-api/3.0/implementation/pom.xml | 2 +- .../rest-api/3.0/model-generator/pom.xml | 2 +- communote/plugins/rest-api/3.0/model/pom.xml | 2 +- communote/plugins/rest-api/3.0/pom.xml | 2 +- communote/plugins/rest-api/pom.xml | 2 +- .../plugins/rest-api/test-plugin/pom.xml | 2 +- communote/pom.xml | 2 +- .../tests/all-versions/integration/pom.xml | 2 +- .../server/test/CommunoteIntegrationTest.java | 23 +++++++++---------- .../tests/all-versions/old-rest-api/pom.xml | 2 +- communote/webapp/pom.xml | 2 +- communote/widgets/jar/pom.xml | 2 +- communote/widgets/pom.xml | 2 +- communote/widgets/war/pom.xml | 2 +- 66 files changed, 76 insertions(+), 77 deletions(-) diff --git a/build/ear/pom.xml b/build/ear/pom.xml index cec2ae1..83f7ea7 100644 --- a/build/ear/pom.xml +++ b/build/ear/pom.xml @@ -3,7 +3,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 communote-ear ear diff --git a/build/installation-package-assembly/pom.xml b/build/installation-package-assembly/pom.xml index a70a620..68aac39 100644 --- a/build/installation-package-assembly/pom.xml +++ b/build/installation-package-assembly/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.communote.server communote-installation-package-assembly - 3.4-SNAPSHOT + 3.4 Communote installation packages This project builds the installation packages for Communote diff --git a/build/war-parent/pom.xml b/build/war-parent/pom.xml index a57bcbe..351dbc8 100644 --- a/build/war-parent/pom.xml +++ b/build/war-parent/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 communote-war-parent pom diff --git a/build/war-standalone/pom.xml b/build/war-standalone/pom.xml index f8dfa79..aa47e1e 100644 --- a/build/war-standalone/pom.xml +++ b/build/war-standalone/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-war-parent - 3.4-SNAPSHOT + 3.4 ../war-parent communote-war-standalone diff --git a/communote/api/pom.xml b/communote/api/pom.xml index 2eca5e3..5ff9ac8 100644 --- a/communote/api/pom.xml +++ b/communote/api/pom.xml @@ -4,7 +4,7 @@ communote-server-parent com.communote.server - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/commons/pom.xml b/communote/commons/pom.xml index 1ad1faa..5520da5 100644 --- a/communote/commons/pom.xml +++ b/communote/commons/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 communote-commons diff --git a/communote/core/pom.xml b/communote/core/pom.xml index 56efd07..dac0877 100644 --- a/communote/core/pom.xml +++ b/communote/core/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 communote-server-core-impl diff --git a/communote/parent/pom.xml b/communote/parent/pom.xml index 8769d41..dd7bda6 100644 --- a/communote/parent/pom.xml +++ b/communote/parent/pom.xml @@ -6,7 +6,7 @@ communote-server-parent pom Communote Parent - 3.4-SNAPSHOT + 3.4 Communote - Parent https://communote.github.io/ diff --git a/communote/persistence/pom.xml b/communote/persistence/pom.xml index dc9a407..a3c4802 100644 --- a/communote/persistence/pom.xml +++ b/communote/persistence/pom.xml @@ -3,7 +3,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-activity-base-plugin/pom.xml b/communote/plugins/communote-activity-base-plugin/pom.xml index 417cfa0..bc98446 100644 --- a/communote/plugins/communote-activity-base-plugin/pom.xml +++ b/communote/plugins/communote-activity-base-plugin/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-activity-core-plugin/pom.xml b/communote/plugins/communote-activity-core-plugin/pom.xml index f6527fd..524a0a6 100644 --- a/communote/plugins/communote-activity-core-plugin/pom.xml +++ b/communote/plugins/communote-activity-core-plugin/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-alias-and-tag-link-renderer-plugin/pom.xml b/communote/plugins/communote-alias-and-tag-link-renderer-plugin/pom.xml index 23f19ff..1e0cfce 100644 --- a/communote/plugins/communote-alias-and-tag-link-renderer-plugin/pom.xml +++ b/communote/plugins/communote-alias-and-tag-link-renderer-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-bookmarklet-plugin/pom.xml b/communote/plugins/communote-bookmarklet-plugin/pom.xml index 9e7cb61..9f111d9 100644 --- a/communote/plugins/communote-bookmarklet-plugin/pom.xml +++ b/communote/plugins/communote-bookmarklet-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-confluence-plugin/pom.xml b/communote/plugins/communote-confluence-plugin/pom.xml index b7a69fb..376a3c1 100644 --- a/communote/plugins/communote-confluence-plugin/pom.xml +++ b/communote/plugins/communote-confluence-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-content-types-extractor-plugin/pom.xml b/communote/plugins/communote-content-types-extractor-plugin/pom.xml index 253bda8..3445de2 100644 --- a/communote/plugins/communote-content-types-extractor-plugin/pom.xml +++ b/communote/plugins/communote-content-types-extractor-plugin/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-core-plugin/pom.xml b/communote/plugins/communote-core-plugin/pom.xml index 6750086..451eb08 100644 --- a/communote/plugins/communote-core-plugin/pom.xml +++ b/communote/plugins/communote-core-plugin/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-embed-plugin/pom.xml b/communote/plugins/communote-embed-plugin/pom.xml index a79666f..fd2ae0f 100644 --- a/communote/plugins/communote-embed-plugin/pom.xml +++ b/communote/plugins/communote-embed-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-html-client/pom.xml b/communote/plugins/communote-html-client/pom.xml index 170581c..02bb01e 100644 --- a/communote/plugins/communote-html-client/pom.xml +++ b/communote/plugins/communote-html-client/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-ldap-plugin/pom.xml b/communote/plugins/communote-ldap-plugin/pom.xml index 27dbb24..d2f2bc0 100644 --- a/communote/plugins/communote-ldap-plugin/pom.xml +++ b/communote/plugins/communote-ldap-plugin/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-activemq/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-activemq/pom.xml index 7df5151..06f2ea6 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-activemq/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-activemq/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-jms/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-jms/pom.xml index c83ecd9..a6bc858 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-jms/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-adapter-jms/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-message-core/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-message-core/pom.xml index 1bac495..97fbda6 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-message-core/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-message-core/pom.xml @@ -6,7 +6,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-message/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-message/pom.xml index 80911cd..c894d3b 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-message/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-message/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-parent/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-parent/pom.xml index 30bf560..630e312 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-parent/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-parent/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 communote-plugins-mq-parent diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-provider-activemq/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-provider-activemq/pom.xml index db1c755..4cabbae 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-provider-activemq/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-provider-activemq/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/communote-plugins-mq-service/pom.xml b/communote/plugins/communote-message-queue/communote-plugins-mq-service/pom.xml index dd97bbc..fc158df 100644 --- a/communote/plugins/communote-message-queue/communote-plugins-mq-service/pom.xml +++ b/communote/plugins/communote-message-queue/communote-plugins-mq-service/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-message-queue/pom.xml b/communote/plugins/communote-message-queue/pom.xml index a78a373..8b2b95a 100644 --- a/communote/plugins/communote-message-queue/pom.xml +++ b/communote/plugins/communote-message-queue/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.communote.plugins communote-plugins-mq-build-all - 3.4-SNAPSHOT + 3.4 pom Communote - Plugins - Message Queue - Build All https://communote.github.io/ diff --git a/communote/plugins/communote-message-queue/producer-test-project/pom.xml b/communote/plugins/communote-message-queue/producer-test-project/pom.xml index 33f6304..b68523b 100644 --- a/communote/plugins/communote-message-queue/producer-test-project/pom.xml +++ b/communote/plugins/communote-message-queue/producer-test-project/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-mq-parent - 3.4-SNAPSHOT + 3.4 ../communote-plugins-mq-parent/pom.xml com.communote.plugins.mq diff --git a/communote/plugins/communote-plugins-parent/pom.xml b/communote/plugins/communote-plugins-parent/pom.xml index 05361b0..e61ee30 100644 --- a/communote/plugins/communote-plugins-parent/pom.xml +++ b/communote/plugins/communote-plugins-parent/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 ../../parent com.communote.plugins diff --git a/communote/plugins/communote-smileys-plugin/pom.xml b/communote/plugins/communote-smileys-plugin/pom.xml index 0879882..c3ccc91 100644 --- a/communote/plugins/communote-smileys-plugin/pom.xml +++ b/communote/plugins/communote-smileys-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/communote-webservice-core-plugin/pom.xml b/communote/plugins/communote-webservice-core-plugin/pom.xml index 9f89907..36ea9e5 100644 --- a/communote/plugins/communote-webservice-core-plugin/pom.xml +++ b/communote/plugins/communote-webservice-core-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/pom.xml b/communote/plugins/pom.xml index 637c768..8e9b06b 100644 --- a/communote/plugins/pom.xml +++ b/communote/plugins/pom.xml @@ -3,7 +3,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/rest-api/1.3/client/pom.xml b/communote/plugins/rest-api/1.3/client/pom.xml index 762c9d7..b096e59 100644 --- a/communote/plugins/rest-api/1.3/client/pom.xml +++ b/communote/plugins/rest-api/1.3/client/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-1.3 - 3.4-SNAPSHOT + 3.4 ../pom.xml com.communote diff --git a/communote/plugins/rest-api/1.3/doc/pom.xml b/communote/plugins/rest-api/1.3/doc/pom.xml index 813301d..1c5577a 100644 --- a/communote/plugins/rest-api/1.3/doc/pom.xml +++ b/communote/plugins/rest-api/1.3/doc/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-1.3 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-1.3-doc diff --git a/communote/plugins/rest-api/1.3/implementation/pom.xml b/communote/plugins/rest-api/1.3/implementation/pom.xml index 9b83bbe..0dc23ac 100644 --- a/communote/plugins/rest-api/1.3/implementation/pom.xml +++ b/communote/plugins/rest-api/1.3/implementation/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-1.3 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-1.3-implementation diff --git a/communote/plugins/rest-api/1.3/model-generator/pom.xml b/communote/plugins/rest-api/1.3/model-generator/pom.xml index ba598a1..f23d3d9 100644 --- a/communote/plugins/rest-api/1.3/model-generator/pom.xml +++ b/communote/plugins/rest-api/1.3/model-generator/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-1.3 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-1.3-model-generator diff --git a/communote/plugins/rest-api/1.3/model/pom.xml b/communote/plugins/rest-api/1.3/model/pom.xml index f38100f..a156da3 100644 --- a/communote/plugins/rest-api/1.3/model/pom.xml +++ b/communote/plugins/rest-api/1.3/model/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-1.3 - 3.4-SNAPSHOT + 3.4 ../pom.xml diff --git a/communote/plugins/rest-api/1.3/pom.xml b/communote/plugins/rest-api/1.3/pom.xml index 170d1e5..261fe22 100644 --- a/communote/plugins/rest-api/1.3/pom.xml +++ b/communote/plugins/rest-api/1.3/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 com.communote.plugins diff --git a/communote/plugins/rest-api/2.2/client/pom.xml b/communote/plugins/rest-api/2.2/client/pom.xml index 14b807c..2267cd0 100644 --- a/communote/plugins/rest-api/2.2/client/pom.xml +++ b/communote/plugins/rest-api/2.2/client/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.2 - 3.4-SNAPSHOT + 3.4 ../pom.xml com.communote diff --git a/communote/plugins/rest-api/2.2/doc/pom.xml b/communote/plugins/rest-api/2.2/doc/pom.xml index db3a6a2..b3254cb 100644 --- a/communote/plugins/rest-api/2.2/doc/pom.xml +++ b/communote/plugins/rest-api/2.2/doc/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.2 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.2-doc diff --git a/communote/plugins/rest-api/2.2/implementation/pom.xml b/communote/plugins/rest-api/2.2/implementation/pom.xml index 888eb53..a3bc59e 100644 --- a/communote/plugins/rest-api/2.2/implementation/pom.xml +++ b/communote/plugins/rest-api/2.2/implementation/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-2.2 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.2-implementation diff --git a/communote/plugins/rest-api/2.2/model-generator/pom.xml b/communote/plugins/rest-api/2.2/model-generator/pom.xml index 4839805..ebc9c5e 100644 --- a/communote/plugins/rest-api/2.2/model-generator/pom.xml +++ b/communote/plugins/rest-api/2.2/model-generator/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-2.2 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.2-model-generator diff --git a/communote/plugins/rest-api/2.2/model/pom.xml b/communote/plugins/rest-api/2.2/model/pom.xml index 982c691..d834cb0 100644 --- a/communote/plugins/rest-api/2.2/model/pom.xml +++ b/communote/plugins/rest-api/2.2/model/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.2 - 3.4-SNAPSHOT + 3.4 ../pom.xml diff --git a/communote/plugins/rest-api/2.2/pom.xml b/communote/plugins/rest-api/2.2/pom.xml index 61788f5..b5aa0dc 100644 --- a/communote/plugins/rest-api/2.2/pom.xml +++ b/communote/plugins/rest-api/2.2/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 diff --git a/communote/plugins/rest-api/2.4/client/pom.xml b/communote/plugins/rest-api/2.4/client/pom.xml index ddacdc9..1631f57 100644 --- a/communote/plugins/rest-api/2.4/client/pom.xml +++ b/communote/plugins/rest-api/2.4/client/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.4 - 3.4-SNAPSHOT + 3.4 ../pom.xml com.communote diff --git a/communote/plugins/rest-api/2.4/doc/pom.xml b/communote/plugins/rest-api/2.4/doc/pom.xml index 2ad987b..5b6f84e 100644 --- a/communote/plugins/rest-api/2.4/doc/pom.xml +++ b/communote/plugins/rest-api/2.4/doc/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.4 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.4-doc diff --git a/communote/plugins/rest-api/2.4/implementation/pom.xml b/communote/plugins/rest-api/2.4/implementation/pom.xml index 7348f6e..7e32ee6 100644 --- a/communote/plugins/rest-api/2.4/implementation/pom.xml +++ b/communote/plugins/rest-api/2.4/implementation/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-2.4 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.4-implementation diff --git a/communote/plugins/rest-api/2.4/model-generator/pom.xml b/communote/plugins/rest-api/2.4/model-generator/pom.xml index 403462c..972d81f 100644 --- a/communote/plugins/rest-api/2.4/model-generator/pom.xml +++ b/communote/plugins/rest-api/2.4/model-generator/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-2.4 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-2.4-model-generator diff --git a/communote/plugins/rest-api/2.4/model/pom.xml b/communote/plugins/rest-api/2.4/model/pom.xml index 96590ba..9047b5f 100644 --- a/communote/plugins/rest-api/2.4/model/pom.xml +++ b/communote/plugins/rest-api/2.4/model/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-2.4 - 3.4-SNAPSHOT + 3.4 ../pom.xml diff --git a/communote/plugins/rest-api/2.4/pom.xml b/communote/plugins/rest-api/2.4/pom.xml index 4342881..04f565d 100644 --- a/communote/plugins/rest-api/2.4/pom.xml +++ b/communote/plugins/rest-api/2.4/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 communote-rest-api-2.4 diff --git a/communote/plugins/rest-api/3.0/client/pom.xml b/communote/plugins/rest-api/3.0/client/pom.xml index 8e30a59..3a36f66 100644 --- a/communote/plugins/rest-api/3.0/client/pom.xml +++ b/communote/plugins/rest-api/3.0/client/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-3.0 - 3.4-SNAPSHOT + 3.4 ../pom.xml com.communote diff --git a/communote/plugins/rest-api/3.0/doc/pom.xml b/communote/plugins/rest-api/3.0/doc/pom.xml index cf28b27..f702cb5 100644 --- a/communote/plugins/rest-api/3.0/doc/pom.xml +++ b/communote/plugins/rest-api/3.0/doc/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-3.0 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-3.0-doc diff --git a/communote/plugins/rest-api/3.0/implementation/pom.xml b/communote/plugins/rest-api/3.0/implementation/pom.xml index 09efe2f..25708da 100644 --- a/communote/plugins/rest-api/3.0/implementation/pom.xml +++ b/communote/plugins/rest-api/3.0/implementation/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-3.0 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-3.0-implementation diff --git a/communote/plugins/rest-api/3.0/model-generator/pom.xml b/communote/plugins/rest-api/3.0/model-generator/pom.xml index fb38f2a..05e45cd 100644 --- a/communote/plugins/rest-api/3.0/model-generator/pom.xml +++ b/communote/plugins/rest-api/3.0/model-generator/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-rest-api-3.0 - 3.4-SNAPSHOT + 3.4 ../pom.xml communote-rest-api-3.0-model-generator diff --git a/communote/plugins/rest-api/3.0/model/pom.xml b/communote/plugins/rest-api/3.0/model/pom.xml index bfb9a7f..6f974f0 100644 --- a/communote/plugins/rest-api/3.0/model/pom.xml +++ b/communote/plugins/rest-api/3.0/model/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-rest-api-3.0 - 3.4-SNAPSHOT + 3.4 ../pom.xml diff --git a/communote/plugins/rest-api/3.0/pom.xml b/communote/plugins/rest-api/3.0/pom.xml index 597fff3..27a8a67 100644 --- a/communote/plugins/rest-api/3.0/pom.xml +++ b/communote/plugins/rest-api/3.0/pom.xml @@ -5,7 +5,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 communote-rest-api-3.0 diff --git a/communote/plugins/rest-api/pom.xml b/communote/plugins/rest-api/pom.xml index aeaab15..34ddedd 100644 --- a/communote/plugins/rest-api/pom.xml +++ b/communote/plugins/rest-api/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 4.0.0 diff --git a/communote/plugins/rest-api/test-plugin/pom.xml b/communote/plugins/rest-api/test-plugin/pom.xml index c29bfa8..99f45f4 100644 --- a/communote/plugins/rest-api/test-plugin/pom.xml +++ b/communote/plugins/rest-api/test-plugin/pom.xml @@ -4,7 +4,7 @@ com.communote.plugins communote-plugins-parent - 3.4-SNAPSHOT + 3.4 communote-rest-api-test-plugin diff --git a/communote/pom.xml b/communote/pom.xml index 1b11acf..f906d16 100644 --- a/communote/pom.xml +++ b/communote/pom.xml @@ -3,7 +3,7 @@ com.communote.server communote-server-build pom - 3.4-SNAPSHOT + 3.4 The Communote Project Communote - Build https://communote.github.io/ diff --git a/communote/tests/all-versions/integration/pom.xml b/communote/tests/all-versions/integration/pom.xml index 2e8f18c..9dd0d7d 100644 --- a/communote/tests/all-versions/integration/pom.xml +++ b/communote/tests/all-versions/integration/pom.xml @@ -5,7 +5,7 @@ communote-server-parent com.communote.server - 3.4-SNAPSHOT + 3.4 tests-all-versions-integration diff --git a/communote/tests/all-versions/integration/src/main/java/com/communote/server/test/CommunoteIntegrationTest.java b/communote/tests/all-versions/integration/src/main/java/com/communote/server/test/CommunoteIntegrationTest.java index c422300..02f82b6 100644 --- a/communote/tests/all-versions/integration/src/main/java/com/communote/server/test/CommunoteIntegrationTest.java +++ b/communote/tests/all-versions/integration/src/main/java/com/communote/server/test/CommunoteIntegrationTest.java @@ -81,8 +81,7 @@ public abstract class CommunoteIntegrationTest { * and read the bundles from there. No need to configure directory here then. */ // TODO How to improve this resolution - public static final String COMMUNOTE_VERSION = System.getProperty("project.version", - "3.4-SNAPSHOT"); + public static final String COMMUNOTE_VERSION = System.getProperty("project.version", "3.4"); private static final Logger LOGGER = LoggerFactory.getLogger(CommunoteIntegrationTest.class); @@ -192,7 +191,7 @@ protected Properties createCoreProperties() { coreProperties.setProperty(CorePropertyDatabase.DATABASE_PROTOCOL_SEPARATOR.getKeyString(), databaseType.getDefaultProtocolSeperator()); coreProperties - .setProperty(CorePropertyDatabase.DATABASE_USER_NAME.getKeyString(), username); + .setProperty(CorePropertyDatabase.DATABASE_USER_NAME.getKeyString(), username); coreProperties.setProperty(CorePropertyDatabase.DATABASE_USER_PASSWORD.getKeyString(), password); coreProperties.setProperty(CorePropertyDatabase.HIBERNATE_DIALECT.getKeyString(), @@ -296,7 +295,7 @@ public void setupApplication(@Optional String instanceName, System.setProperty("java.naming.factory.initial", MockInitialContextFactory.class.getName()); Context mockJeeEnvContext = EasyMock.createMock(Context.class); EasyMock.expect(mockJeeEnvContext.lookup("communote.instance.name")) - .andReturn(instanceName); + .andReturn(instanceName); EasyMock.expect(mockJeeEnvContext.lookup("communote.config.dir")).andReturn( createConfigurationDirectory(instanceName)); EasyMock.replay(mockJeeEnvContext); @@ -305,7 +304,7 @@ public void setupApplication(@Optional String instanceName, // springs webapp context is using the InitialContext too while refreshing the webapp // context, thus mock lookup and close methods EasyMock.expect(mockInitialContext.lookup(EasyMock.not(EasyMock.eq("java:comp/env")))) - .andThrow(new NamingException()).anyTimes(); + .andThrow(new NamingException()).anyTimes(); mockInitialContext.close(); EasyMock.expectLastCall().anyTimes(); EasyMock.replay(mockInitialContext); @@ -314,24 +313,24 @@ public void setupApplication(@Optional String instanceName, // create Communote runtime with additional test beans DefaultRuntimeBuilder runtimeBuilder = DefaultRuntimeBuilder.getInstance(); runtimeBuilder - .addApplicationContextConfigLocation("classpath:/com/communote/server/test/spring/applicationContext-test.xml"); + .addApplicationContextConfigLocation("classpath:/com/communote/server/test/spring/applicationContext-test.xml"); runtimeBuilder.setApplicationDirectory(applicationRealDir.getAbsolutePath()); CommunoteRuntime.init(runtimeBuilder); // create a webapplication context with custom test beans. This context is needed by the // plugins. this.testWebAppContext = new XmlWebApplicationContext(); testWebAppContext - .setConfigLocation("classpath:/com/communote/server/test/spring/webApplicationContext-test.xml"); + .setConfigLocation("classpath:/com/communote/server/test/spring/webApplicationContext-test.xml"); // Add a precondition to wait for our test webapp context. CommunoteRuntime.getInstance().addInitializationCondition( "TEST_WEB_APP_CONTEXT_INITIALIZED"); CommunoteRuntime.getInstance().start(); // expose test packages for testing plugins ServiceLocator - .instance() - .getService(OSGiManagement.class) - .addFrameworkPropertiesLocation( - "classpath:/com/communote/server/test/osgi/test_osgi.properties"); + .instance() + .getService(OSGiManagement.class) + .addFrameworkPropertiesLocation( + "classpath:/com/communote/server/test/osgi/test_osgi.properties"); // webapp context must be refreshed manually testWebAppContext.refresh(); // webapp context is ready -> precondition is fulfilled @@ -454,7 +453,7 @@ public void setupDatabaseUser(@Optional("communote") String dbUsername, * Exception. */ @Parameters({ "testBaseDirectory", "dbTypeIdentifier", "dbHost", "dbPort", - "jdbcURLQueryString", "dbName", "tempDbName" }) + "jdbcURLQueryString", "dbName", "tempDbName" }) @BeforeClass(dependsOnMethods = "setupDatabaseUser", groups = GROUP_INTEGRATION_TEST_SETUP) public void setupIntegrationTest(String testBaseDirectory, @Optional("POSTGRESQL") String dbTypeIdentifier, @Optional("localhost") String dbHost, diff --git a/communote/tests/all-versions/old-rest-api/pom.xml b/communote/tests/all-versions/old-rest-api/pom.xml index 016a689..520afda 100644 --- a/communote/tests/all-versions/old-rest-api/pom.xml +++ b/communote/tests/all-versions/old-rest-api/pom.xml @@ -5,7 +5,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 tests-api jar diff --git a/communote/webapp/pom.xml b/communote/webapp/pom.xml index b550a83..1f5c9eb 100644 --- a/communote/webapp/pom.xml +++ b/communote/webapp/pom.xml @@ -5,7 +5,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 communote-server-web diff --git a/communote/widgets/jar/pom.xml b/communote/widgets/jar/pom.xml index 7aabaf8..baaeddb 100644 --- a/communote/widgets/jar/pom.xml +++ b/communote/widgets/jar/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-widgets - 3.4-SNAPSHOT + 3.4 communote-server-widgets-jar jar diff --git a/communote/widgets/pom.xml b/communote/widgets/pom.xml index cb38d27..4224315 100644 --- a/communote/widgets/pom.xml +++ b/communote/widgets/pom.xml @@ -5,7 +5,7 @@ com.communote.server communote-server-parent - 3.4-SNAPSHOT + 3.4 com.communote.server diff --git a/communote/widgets/war/pom.xml b/communote/widgets/war/pom.xml index 8fa9368..561e504 100644 --- a/communote/widgets/war/pom.xml +++ b/communote/widgets/war/pom.xml @@ -4,7 +4,7 @@ com.communote.server communote-server-widgets - 3.4-SNAPSHOT + 3.4 communote-server-widgets-war war