Skip to content

Commit

Permalink
Merge pull request emdev-limited#1 from andreessen/6.1.x
Browse files Browse the repository at this point in the history 
Due to service-builder issue http://issues.liferay.com/browse/LPS-29668
  • Loading branch information
@akakunin
akakunin committed Apr 15, 2013
2 parents 0962fb1 + 2b96ef0 commit 95374c6
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 32 deletions.
4 changes: 2 additions & 2 deletions archetypes/liferay-ext-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-hook-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-layouttpl-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-icefaces-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,4 +30,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-jsf-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,4 +30,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,4 +30,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-primefaces-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,4 +30,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-richfaces-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,4 +30,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-servicebuilder-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-theme-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/liferay-web-archetype/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>maven-support</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -26,4 +26,4 @@
<module>liferay-theme-archetype</module>
<module>liferay-web-archetype</module>
</modules>
</project>
</project>
6 changes: 3 additions & 3 deletions plugins/liferay-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.liferay.maven</groupId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-impl</artifactId>
<version>${liferay.version}</version>
<version>${liferay.impl.version}</version>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
Expand Down Expand Up @@ -268,4 +268,4 @@
<version>1.6.2</version>
</dependency>
</dependencies>
</project>
</project>
4 changes: 2 additions & 2 deletions plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>maven-support</artifactId>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -15,4 +15,4 @@
<modules>
<module>liferay-maven-plugin</module>
</modules>
</project>
</project>
8 changes: 7 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>maven-support</artifactId>
<packaging>pom</packaging>
<name>Liferay Maven 2 Support</name>
<version>6.1.1-emdev.2</version>
<version>6.1.1-emdev.3</version>
<description>Parent project to support Maven 2 subprojects.</description>
<url>http://www.liferay.com</url>
<developers>
Expand Down Expand Up @@ -88,6 +88,11 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>emdev-private</id>
<name>EmDev Private</name>
<url>http://build.emdev.ru/nexus/content/repositories/emdev-private</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -166,6 +171,7 @@
</profiles>
<properties>
<liferay.version>6.1.1</liferay.version>
<liferay.impl.version>6.1.1-emdev</liferay.impl.version>
<maven.version>2.0.10</maven.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<liferay.repository.release.id>sonatype-staging</liferay.repository.release.id>
Expand Down

0 comments on commit 95374c6

Please sign in to comment.