Skip to content

Commit 95374c6

Browse files
akakuninakakunin
committed
Merge pull request emdev-limited#1 from andreessen/6.1.x
Due to service-builder issue http://issues.liferay.com/browse/LPS-29668
2 parents 0962fb1 + 2b96ef0 commit 95374c6

File tree

16 files changed

+38
-32
lines changed

16 files changed

+38
-32
lines changed

‎archetypes/liferay-ext-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-hook-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-layouttpl-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-portlet-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-portlet-icefaces-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
3030
</plugin>
3131
</plugins>
3232
</build>
33-
</project>
33+
</project>

‎archetypes/liferay-portlet-jsf-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
3030
</plugin>
3131
</plugins>
3232
</build>
33-
</project>
33+
</project>

‎archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
3030
</plugin>
3131
</plugins>
3232
</build>
33-
</project>
33+
</project>

‎archetypes/liferay-portlet-primefaces-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
3030
</plugin>
3131
</plugins>
3232
</build>
33-
</project>
33+
</project>

‎archetypes/liferay-portlet-richfaces-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
3030
</plugin>
3131
</plugins>
3232
</build>
33-
</project>
33+
</project>

‎archetypes/liferay-servicebuilder-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-theme-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/liferay-web-archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>liferay-archetypes</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -29,4 +29,4 @@
2929
</plugin>
3030
</plugins>
3131
</build>
32-
</project>
32+
</project>

‎archetypes/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>maven-support</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -26,4 +26,4 @@
2626
<module>liferay-theme-archetype</module>
2727
<module>liferay-web-archetype</module>
2828
</modules>
29-
</project>
29+
</project>

‎plugins/liferay-maven-plugin/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>plugins</artifactId>
66
<groupId>com.liferay.maven</groupId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.liferay.portal</groupId>
3333
<artifactId>portal-impl</artifactId>
34-
<version>${liferay.version}</version>
34+
<version>${liferay.impl.version}</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.liferay.portal</groupId>
@@ -268,4 +268,4 @@
268268
<version>1.6.2</version>
269269
</dependency>
270270
</dependencies>
271-
</project>
271+
</project>

‎plugins/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.liferay.maven</groupId>
66
<artifactId>maven-support</artifactId>
7-
<version>6.1.1-emdev.2</version>
7+
<version>6.1.1-emdev.3</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -15,4 +15,4 @@
1515
<modules>
1616
<module>liferay-maven-plugin</module>
1717
</modules>
18-
</project>
18+
</project>

‎pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>maven-support</artifactId>
77
<packaging>pom</packaging>
88
<name>Liferay Maven 2 Support</name>
9-
<version>6.1.1-emdev.2</version>
9+
<version>6.1.1-emdev.3</version>
1010
<description>Parent project to support Maven 2 subprojects.</description>
1111
<url>http://www.liferay.com</url>
1212
<developers>
@@ -88,6 +88,11 @@
8888
<enabled>false</enabled>
8989
</snapshots>
9090
</repository>
91+
<repository>
92+
<id>emdev-private</id>
93+
<name>EmDev Private</name>
94+
<url>http://build.emdev.ru/nexus/content/repositories/emdev-private</url>
95+
</repository>
9196
</repositories>
9297
<pluginRepositories>
9398
<pluginRepository>
@@ -166,6 +171,7 @@
166171
</profiles>
167172
<properties>
168173
<liferay.version>6.1.1</liferay.version>
174+
<liferay.impl.version>6.1.1-emdev</liferay.impl.version>
169175
<maven.version>2.0.10</maven.version>
170176
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
171177
<liferay.repository.release.id>sonatype-staging</liferay.repository.release.id>

0 commit comments

Comments
 (0)