From 2b96ef0ca9ef6062cdd8ee96b4f6b2f514d47fc8 Mon Sep 17 00:00:00 2001 From: andreessen Date: Mon, 15 Apr 2013 22:07:04 +0400 Subject: [PATCH] Due to service-builder issue http://issues.liferay.com/browse/LPS-29668 our version of portal-impl.jar 6.1.1 was uploaded to http://build.emdev.ru/nexus. Besides that this fix was backported to our Bitbucket repo having commit id a7e9cd1. Version changed to 6.1.1-emdev.3. --- archetypes/liferay-ext-archetype/pom.xml | 4 ++-- archetypes/liferay-hook-archetype/pom.xml | 4 ++-- archetypes/liferay-layouttpl-archetype/pom.xml | 4 ++-- archetypes/liferay-portlet-archetype/pom.xml | 4 ++-- archetypes/liferay-portlet-icefaces-archetype/pom.xml | 4 ++-- archetypes/liferay-portlet-jsf-archetype/pom.xml | 4 ++-- .../liferay-portlet-liferay-faces-alloy-archetype/pom.xml | 4 ++-- archetypes/liferay-portlet-primefaces-archetype/pom.xml | 4 ++-- archetypes/liferay-portlet-richfaces-archetype/pom.xml | 4 ++-- archetypes/liferay-servicebuilder-archetype/pom.xml | 4 ++-- archetypes/liferay-theme-archetype/pom.xml | 4 ++-- archetypes/liferay-web-archetype/pom.xml | 4 ++-- archetypes/pom.xml | 4 ++-- plugins/liferay-maven-plugin/pom.xml | 6 +++--- plugins/pom.xml | 4 ++-- pom.xml | 8 +++++++- 16 files changed, 38 insertions(+), 32 deletions(-) diff --git a/archetypes/liferay-ext-archetype/pom.xml b/archetypes/liferay-ext-archetype/pom.xml index 5c533f66..c785b231 100644 --- a/archetypes/liferay-ext-archetype/pom.xml +++ b/archetypes/liferay-ext-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-hook-archetype/pom.xml b/archetypes/liferay-hook-archetype/pom.xml index 03cea59d..c0c4839c 100644 --- a/archetypes/liferay-hook-archetype/pom.xml +++ b/archetypes/liferay-hook-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-layouttpl-archetype/pom.xml b/archetypes/liferay-layouttpl-archetype/pom.xml index a00ae728..2054e684 100644 --- a/archetypes/liferay-layouttpl-archetype/pom.xml +++ b/archetypes/liferay-layouttpl-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-archetype/pom.xml b/archetypes/liferay-portlet-archetype/pom.xml index 3b6276d3..6b9d6511 100644 --- a/archetypes/liferay-portlet-archetype/pom.xml +++ b/archetypes/liferay-portlet-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-icefaces-archetype/pom.xml b/archetypes/liferay-portlet-icefaces-archetype/pom.xml index 218119ff..6e451ad9 100644 --- a/archetypes/liferay-portlet-icefaces-archetype/pom.xml +++ b/archetypes/liferay-portlet-icefaces-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-jsf-archetype/pom.xml b/archetypes/liferay-portlet-jsf-archetype/pom.xml index 4b6846cc..a04d9114 100644 --- a/archetypes/liferay-portlet-jsf-archetype/pom.xml +++ b/archetypes/liferay-portlet-jsf-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml b/archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml index e45d1ec3..9a23e25f 100644 --- a/archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml +++ b/archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-primefaces-archetype/pom.xml b/archetypes/liferay-portlet-primefaces-archetype/pom.xml index e7664f49..3d3a9b0d 100644 --- a/archetypes/liferay-portlet-primefaces-archetype/pom.xml +++ b/archetypes/liferay-portlet-primefaces-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-portlet-richfaces-archetype/pom.xml b/archetypes/liferay-portlet-richfaces-archetype/pom.xml index 249e1699..7013939f 100644 --- a/archetypes/liferay-portlet-richfaces-archetype/pom.xml +++ b/archetypes/liferay-portlet-richfaces-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-servicebuilder-archetype/pom.xml b/archetypes/liferay-servicebuilder-archetype/pom.xml index f63135ac..4a7f5456 100644 --- a/archetypes/liferay-servicebuilder-archetype/pom.xml +++ b/archetypes/liferay-servicebuilder-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-theme-archetype/pom.xml b/archetypes/liferay-theme-archetype/pom.xml index c9ca6574..5b0a6d5a 100644 --- a/archetypes/liferay-theme-archetype/pom.xml +++ b/archetypes/liferay-theme-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/liferay-web-archetype/pom.xml b/archetypes/liferay-web-archetype/pom.xml index 722055e8..694c9a47 100644 --- a/archetypes/liferay-web-archetype/pom.xml +++ b/archetypes/liferay-web-archetype/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven liferay-archetypes - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1ff5e609..7bde299d 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven maven-support - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -26,4 +26,4 @@ liferay-theme-archetype liferay-web-archetype - \ No newline at end of file + diff --git a/plugins/liferay-maven-plugin/pom.xml b/plugins/liferay-maven-plugin/pom.xml index b981f866..1f58618e 100644 --- a/plugins/liferay-maven-plugin/pom.xml +++ b/plugins/liferay-maven-plugin/pom.xml @@ -4,7 +4,7 @@ plugins com.liferay.maven - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -31,7 +31,7 @@ com.liferay.portal portal-impl - ${liferay.version} + ${liferay.impl.version} com.liferay.portal @@ -268,4 +268,4 @@ 1.6.2 - \ No newline at end of file + diff --git a/plugins/pom.xml b/plugins/pom.xml index 1e646cba..abd2c0bc 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.liferay.maven maven-support - 6.1.1-emdev.2 + 6.1.1-emdev.3 ../pom.xml 4.0.0 @@ -15,4 +15,4 @@ liferay-maven-plugin - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index dcb478d3..66b4b79f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ maven-support pom Liferay Maven 2 Support - 6.1.1-emdev.2 + 6.1.1-emdev.3 Parent project to support Maven 2 subprojects. http://www.liferay.com @@ -88,6 +88,11 @@ false + + emdev-private + EmDev Private + http://build.emdev.ru/nexus/content/repositories/emdev-private + @@ -166,6 +171,7 @@ 6.1.1 + 6.1.1-emdev 2.0.10 UTF-8 sonatype-staging