Repository: syncope Updated Branches: refs/heads/master cb2f095bf -> 46840df38
[maven-release-plugin] prepare release syncope-2.0.0-M1 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/46840df3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/46840df3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/46840df3 Branch: refs/heads/master Commit: 46840df380a855d8a0dd827e8cb2db992f18134c Parents: cb2f095 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Dec 23 08:18:49 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Dec 23 08:18:49 2015 +0100 ---------------------------------------------------------------------- archetype/pom.xml | 2 +- client/cli/pom.xml | 5 ++-- client/console/pom.xml | 2 +- client/enduser/pom.xml | 2 +- client/lib/pom.xml | 2 +- client/pom.xml | 2 +- common/lib/pom.xml | 2 +- common/pom.xml | 2 +- common/rest-api/pom.xml | 2 +- core/logic/pom.xml | 2 +- core/misc/pom.xml | 2 +- core/persistence-api/pom.xml | 2 +- core/persistence-jpa/pom.xml | 2 +- core/pom.xml | 2 +- core/provisioning-api/pom.xml | 2 +- core/provisioning-java/pom.xml | 2 +- core/rest-cxf/pom.xml | 24 +++++----------- core/workflow-activiti/pom.xml | 2 +- core/workflow-api/pom.xml | 2 +- core/workflow-java/pom.xml | 2 +- deb/console/pom.xml | 2 +- deb/core/pom.xml | 2 +- deb/enduser/pom.xml | 2 +- deb/pom.xml | 2 +- ext/camel/client-console/pom.xml | 2 +- ext/camel/common-lib/pom.xml | 2 +- ext/camel/logic/pom.xml | 2 +- ext/camel/persistence-api/pom.xml | 2 +- ext/camel/persistence-jpa/pom.xml | 2 +- ext/camel/pom.xml | 2 +- ext/camel/provisioning-api/pom.xml | 2 +- ext/camel/provisioning-camel/pom.xml | 2 +- ext/camel/rest-api/pom.xml | 2 +- ext/camel/rest-cxf/pom.xml | 2 +- ext/pom.xml | 2 +- ext/swagger-ui/pom.xml | 20 ++----------- fit/build-tools/pom.xml | 2 +- fit/console-reference/pom.xml | 47 ++++++++----------------------- fit/core-reference/pom.xml | 11 ++++---- fit/enduser-reference/pom.xml | 2 +- fit/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 17 +++++------ standalone/pom.xml | 2 +- 44 files changed, 75 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/archetype/pom.xml ---------------------------------------------------------------------- diff --git a/archetype/pom.xml b/archetype/pom.xml index 0d8f570..69f488f 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Archetype</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/client/cli/pom.xml ---------------------------------------------------------------------- diff --git a/client/cli/pom.xml b/client/cli/pom.xml index 1548b26..1e49676 100644 --- a/client/cli/pom.xml +++ b/client/cli/pom.xml @@ -17,15 +17,14 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-client</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Client CLI</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/client/console/pom.xml ---------------------------------------------------------------------- diff --git a/client/console/pom.xml b/client/console/pom.xml index 5d3e658..dcf17dc 100644 --- a/client/console/pom.xml +++ b/client/console/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-client</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Client Console</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/client/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml index 372ac7a..123a82b 100644 --- a/client/enduser/pom.xml +++ b/client/enduser/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-client</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Client Enduser</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/client/lib/pom.xml ---------------------------------------------------------------------- diff --git a/client/lib/pom.xml b/client/lib/pom.xml index ef5481c..21dc62f 100644 --- a/client/lib/pom.xml +++ b/client/lib/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-client</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Client Lib</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index b2ab47a..633ad9d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Client</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/common/lib/pom.xml ---------------------------------------------------------------------- diff --git a/common/lib/pom.xml b/common/lib/pom.xml index eda26a4..9d4dccf 100644 --- a/common/lib/pom.xml +++ b/common/lib/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-common</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Common Lib</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 2a83aa2..a21db29 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Common</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/common/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml index 386dd8e..a9786d4 100644 --- a/common/rest-api/pom.xml +++ b/common/rest-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-common</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Common REST API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/logic/pom.xml ---------------------------------------------------------------------- diff --git a/core/logic/pom.xml b/core/logic/pom.xml index 7b25e9b..528503b 100644 --- a/core/logic/pom.xml +++ b/core/logic/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Logic</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/misc/pom.xml ---------------------------------------------------------------------- diff --git a/core/misc/pom.xml b/core/misc/pom.xml index d9c6049..d6d78d1 100644 --- a/core/misc/pom.xml +++ b/core/misc/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Misc</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/persistence-api/pom.xml ---------------------------------------------------------------------- diff --git a/core/persistence-api/pom.xml b/core/persistence-api/pom.xml index 10745e7..4713939 100644 --- a/core/persistence-api/pom.xml +++ b/core/persistence-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Persistence API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/persistence-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml index 7f1ff38..44448cb 100644 --- a/core/persistence-jpa/pom.xml +++ b/core/persistence-jpa/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Persistence JPA</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 35a4958..0cb2a0a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/provisioning-api/pom.xml ---------------------------------------------------------------------- diff --git a/core/provisioning-api/pom.xml b/core/provisioning-api/pom.xml index 8bc9432..95320f1 100644 --- a/core/provisioning-api/pom.xml +++ b/core/provisioning-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Provisioning API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/provisioning-java/pom.xml ---------------------------------------------------------------------- diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml index 85ea59f..fc75bb6 100644 --- a/core/provisioning-java/pom.xml +++ b/core/provisioning-java/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Provisioning Java</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml index 7f816b3..d1a8dfe 100644 --- a/core/rest-cxf/pom.xml +++ b/core/rest-cxf/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core REST CXF</name> @@ -268,25 +268,15 @@ under the License. <phase>pre-site</phase> <configuration> <target> - <replace file="${project.build.directory}/generated/wadl/index.html" - token="../webjars/jquery/$/jquery.min.js" - value="https://code.jquery.com/jquery-${jquery.version}.min.js"/> - <replace file="${project.build.directory}/generated/wadl/index.html" - token="../webjars/jquery-ui/$/jquery-ui.min.js" - value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js"/> - <replace file="${project.build.directory}/generated/wadl/index.html" - token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" - value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css"/> + <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery/$/jquery.min.js" value="https://code.jquery.com/jquery-${jquery.version}.min.js"; /> + <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui/$/jquery-ui.min.js" value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js"; /> + <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css"; /> - <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" - token="../webjars/highlightjs/$/highlight.min.js" - value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js"/> - <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" - token="../webjars/highlightjs/$/styles/default.min.css" - value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css"/> + <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js"; /> + <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css"; /> <copy todir="${site.deploymentBaseDir}/rest/2.0"> - <fileset dir="${project.build.directory}/generated/wadl"/> + <fileset dir="${project.build.directory}/generated/wadl" /> </copy> </target> </configuration> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/workflow-activiti/pom.xml ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/pom.xml b/core/workflow-activiti/pom.xml index 07395ef..c97d697 100644 --- a/core/workflow-activiti/pom.xml +++ b/core/workflow-activiti/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Workflow Activiti</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/workflow-api/pom.xml ---------------------------------------------------------------------- diff --git a/core/workflow-api/pom.xml b/core/workflow-api/pom.xml index 3692c44..61dce7a 100644 --- a/core/workflow-api/pom.xml +++ b/core/workflow-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Workflow API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/core/workflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/core/workflow-java/pom.xml b/core/workflow-java/pom.xml index 42ae77c..fb38438 100644 --- a/core/workflow-java/pom.xml +++ b/core/workflow-java/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-core</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Core Workflow Java</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/deb/console/pom.xml ---------------------------------------------------------------------- diff --git a/deb/console/pom.xml b/deb/console/pom.xml index bca1731..0c0dd0d 100644 --- a/deb/console/pom.xml +++ b/deb/console/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-deb</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Deb Console</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/deb/core/pom.xml ---------------------------------------------------------------------- diff --git a/deb/core/pom.xml b/deb/core/pom.xml index 137a81a..ffa3539 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-deb</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Deb Core</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/deb/enduser/pom.xml ---------------------------------------------------------------------- diff --git a/deb/enduser/pom.xml b/deb/enduser/pom.xml index 982e9c9..9f26350 100644 --- a/deb/enduser/pom.xml +++ b/deb/enduser/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-deb</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Deb Enduser</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/deb/pom.xml ---------------------------------------------------------------------- diff --git a/deb/pom.xml b/deb/pom.xml index a78ddbc..f94109a 100644 --- a/deb/pom.xml +++ b/deb/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Deb</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/client-console/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/client-console/pom.xml b/ext/camel/client-console/pom.xml index c163e37..546d8a5 100644 --- a/ext/camel/client-console/pom.xml +++ b/ext/camel/client-console/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Client Console</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/common-lib/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/common-lib/pom.xml b/ext/camel/common-lib/pom.xml index dea04c7..8476554 100644 --- a/ext/camel/common-lib/pom.xml +++ b/ext/camel/common-lib/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Common Lib</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/logic/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/logic/pom.xml b/ext/camel/logic/pom.xml index bc8182a..cbc47ce 100644 --- a/ext/camel/logic/pom.xml +++ b/ext/camel/logic/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Logic</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/persistence-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-api/pom.xml b/ext/camel/persistence-api/pom.xml index 6220f08..8b74c02 100644 --- a/ext/camel/persistence-api/pom.xml +++ b/ext/camel/persistence-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Persistence API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/persistence-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/persistence-jpa/pom.xml b/ext/camel/persistence-jpa/pom.xml index 4dfece3..e163b2b 100644 --- a/ext/camel/persistence-jpa/pom.xml +++ b/ext/camel/persistence-jpa/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Persistence JPA</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/pom.xml b/ext/camel/pom.xml index 638a19d..3ba291b 100644 --- a/ext/camel/pom.xml +++ b/ext/camel/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-ext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/provisioning-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-api/pom.xml b/ext/camel/provisioning-api/pom.xml index 308ed4e..27b4b84 100644 --- a/ext/camel/provisioning-api/pom.xml +++ b/ext/camel/provisioning-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Provisioning API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/provisioning-camel/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/pom.xml b/ext/camel/provisioning-camel/pom.xml index 3e7f41d..ea3747a 100644 --- a/ext/camel/provisioning-camel/pom.xml +++ b/ext/camel/provisioning-camel/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel Provisioning</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/rest-api/pom.xml b/ext/camel/rest-api/pom.xml index 69a7373..8233b8d 100644 --- a/ext/camel/rest-api/pom.xml +++ b/ext/camel/rest-api/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel REST API</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/camel/rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/ext/camel/rest-cxf/pom.xml b/ext/camel/rest-cxf/pom.xml index 7a8f355..ca44469 100644 --- a/ext/camel/rest-cxf/pom.xml +++ b/ext/camel/rest-cxf/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope.ext</groupId> <artifactId>syncope-ext-camel</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Camel REST CXF</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pom.xml b/ext/pom.xml index dcd9fc6..429eb20 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/ext/swagger-ui/pom.xml ---------------------------------------------------------------------- diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml index 77fa7fb..8285aaa 100644 --- a/ext/swagger-ui/pom.xml +++ b/ext/swagger-ui/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-ext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Extensions: Swagger UI</name> @@ -112,23 +112,7 @@ under the License. </goals> <configuration> <target> - <replace file="${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/swagger-ui.js" - token="return url + requestUrl + querystring;" - value=" var matrixstring = ''; - for (var i = 0; i < this.parameters.length; i++) { - var param = this.parameters[i]; - - if (param.in === 'matrix') { - matrixstring += ';' + this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]); - } - } - - var url = this.scheme + '://' + this.host; - - if (this.basePath !== '/') { - url += this.basePath; - } - return url + requestUrl + matrixstring + querystring;"/> + <replace file="${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/swagger-ui.js" token="return url + requestUrl + querystring;" value="
var matrixstring = '';
 for (var i = 0; i < this.parameters.length; i++) {
 var param = this.parameters[i];
 
 if (param.in === 'matrix') {
 matrixstring += ';' + this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
 }
 }
 
 var url = this.scheme + '://' + this.host;
 
 if (this.basePath !== '/') {
 url += this.basePath;
 }
 return url + requestUrl + matrixstring + querystring;" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/fit/build-tools/pom.xml ---------------------------------------------------------------------- diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml index 679eee6..c264eea 100644 --- a/fit/build-tools/pom.xml +++ b/fit/build-tools/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-fit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope FIT Build Tools</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/fit/console-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index b77ccea..41c6b11 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-fit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope FIT Console Reference</name> @@ -149,48 +149,25 @@ under the License. <phase>process-resources</phase> <configuration> <target> - <unzip src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war" - dest="${project.build.directory}/activiti-webapp-explorer2" /> + <unzip src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war" dest="${project.build.directory}/activiti-webapp-explorer2" /> <mkdir dir="${activiti-modeler.directory}" /> - <copy file="${project.build.directory}/activiti-webapp-explorer2/modeler.html" - todir="${activiti-modeler.directory}" /> - <replace file="${activiti-modeler.directory}/modeler.html" - token="</head>" - value="<script type="text/javascript">window.onunload = refreshParent; function refreshParent() { window.opener.location.reload(); }</script></head>"/> - <copy file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json" - todir="${activiti-modeler.directory}" /> + <copy file="${project.build.directory}/activiti-webapp-explorer2/modeler.html" todir="${activiti-modeler.directory}" /> + <replace file="${activiti-modeler.directory}/modeler.html" token="</head>" value="<script type="text/javascript">window.onunload = refreshParent; function refreshParent() { window.opener.location.reload(); }</script></head>" /> + <copy file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json" todir="${activiti-modeler.directory}" /> <mkdir dir="${activiti-modeler.directory}/editor-app" /> <copy todir="${activiti-modeler.directory}/editor-app"> <fileset dir="${project.build.directory}/activiti-webapp-explorer2/editor-app" /> </copy> - <replaceregexp file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - match="ORYX.CONFIG.ROOT_PATH =.*"editor/"; //TODO: Remove last slash!!" - replace="BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket')); -ORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor-app/editor/";" - byline="true"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now(), {" - value="new Ajax.Request(window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler')) + "/activiti-modeler/stencilset.json", {"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="ORYX.Editor.createByUrl(modelUrl);" - value="modelUrl = BASE_PATH + "/workflowDefGET"; -ORYX.Editor.createByUrl(modelUrl);"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="ORYX.Editor.createByUrl = function(modelUrl){" - value="modelUrl = BASE_PATH + "/workflowDefGET"; -ORYX.Editor.createByUrl = function(modelUrl){"/> - <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js" - token="window.location.href = "./";" - value="window.close();"/> + <replaceregexp file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" match="ORYX.CONFIG.ROOT_PATH =.*"editor/"; //TODO: Remove last slash!!" replace="BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket')); ORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor-app/editor/";" byline="true" /> + <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" token="new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now(), {" value="new Ajax.Request(window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler')) + "/activiti-modeler/stencilset.json", {" /> + <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" token="ORYX.Editor.createByUrl(modelUrl);" value="modelUrl = BASE_PATH + "/workflowDefGET"; ORYX.Editor.createByUrl(modelUrl);" /> + <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" token="ORYX.Editor.createByUrl = function(modelUrl){" value="modelUrl = BASE_PATH + "/workflowDefGET"; ORYX.Editor.createByUrl = function(modelUrl){" /> + <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js" token="window.location.href = "./";" value="window.close();" /> - <copy file="${basedir}/src/main/resources/url-config.js" - todir="${activiti-modeler.directory}/editor-app/configuration" - overwrite="true" /> - <copy file="${basedir}/src/main/resources/save-model.html" - todir="${activiti-modeler.directory}/editor-app/popups" - overwrite="true" /> + <copy file="${basedir}/src/main/resources/url-config.js" todir="${activiti-modeler.directory}/editor-app/configuration" overwrite="true" /> + <copy file="${basedir}/src/main/resources/save-model.html" todir="${activiti-modeler.directory}/editor-app/popups" overwrite="true" /> </target> </configuration> <goals> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 7ba8c4a..661a4a2 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-fit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope FIT Core Reference</name> @@ -182,10 +182,10 @@ under the License. <phase>pre-integration-test</phase> <configuration> <target> - <copy file="${project.build.directory}/test-classes/test.csv" todir="${test.csvdir.path}" overwrite="true"/> + <copy file="${project.build.directory}/test-classes/test.csv" todir="${test.csvdir.path}" overwrite="true" /> - <mkdir dir="${cli-test.dir}"/> - <unzip src="${basedir}/../../client/cli/target/syncope-client-cli-${project.version}.zip" dest="${cli-test.dir}"/> + <mkdir dir="${cli-test.dir}" /> + <unzip src="${basedir}/../../client/cli/target/syncope-client-cli-${project.version}.zip" dest="${cli-test.dir}" /> </target> </configuration> <goals> @@ -644,8 +644,7 @@ under the License. <configuration> <target> <delete> - <fileset dir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib" - includes="syncope-*-persistence-jpa-${project.version}.jar"/> + <fileset dir="${project.build.directory}/${project.build.finalName}/WEB-INF/lib" includes="syncope-*-persistence-jpa-${project.version}.jar" /> </delete> </target> </configuration> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/fit/enduser-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index 707e4f5..e377433 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope-fit</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope FIT Enduser Reference</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index 904b134..b08d680 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope FIT</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/installer/pom.xml ---------------------------------------------------------------------- diff --git a/installer/pom.xml b/installer/pom.xml index 3f0ae2c..6adaa40 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Installer</name> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 74cb919..bae7dca 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ under the License. <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> <packaging>pom</packaging> <parent> @@ -52,6 +52,7 @@ under the License. <connection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url> + <tag>syncope-2.0.0-M1</tag> </scm> <issueManagement> @@ -1671,10 +1672,10 @@ under the License. <year>${year}</year> <numbered>true</numbered> <icons>font</icons> - <pagenums/> - <idprefix/> + <pagenums /> + <idprefix /> <idseparator>-</idseparator> - <allow-uri-read/> + <allow-uri-read /> </attributes> </configuration> <executions> @@ -1798,7 +1799,7 @@ under the License. <configuration> <target> <replace dir="${rootpom.basedir}/target/site" token="48px" value="70px"> - <include name="**/*.html"/> + <include name="**/*.html" /> </replace> </target> </configuration> @@ -1812,11 +1813,11 @@ under the License. <configuration> <target> <copy todir="${site.deploymentBaseDir}/docs"> - <fileset dir="${project.build.directory}/generated-docs/" includes="getting-started.*"/> - <fileset dir="${project.build.directory}/generated-docs/" includes="reference-guide.*"/> + <fileset dir="${project.build.directory}/generated-docs/" includes="getting-started.*" /> + <fileset dir="${project.build.directory}/generated-docs/" includes="reference-guide.*" /> </copy> <copy todir="${site.deploymentBaseDir}/docs/images"> - <fileset dir="${project.build.directory}/generated-docs/images"/> + <fileset dir="${project.build.directory}/generated-docs/images" /> </copy> </target> </configuration> http://git-wip-us.apache.org/repos/asf/syncope/blob/46840df3/standalone/pom.xml ---------------------------------------------------------------------- diff --git a/standalone/pom.xml b/standalone/pom.xml index 26f5765..28cd1eb 100644 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.syncope</groupId> <artifactId>syncope</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-M1</version> </parent> <name>Apache Syncope Standalone Distribution</name>
