Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Maven 206 - enable correct jdk version guessing in liferay children builds #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Maven 206 - enable correct jdk version guessing in liferay children builds #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570eff0
Bump version 6.2.5.1-SNAPSHOT
Mar 3, 2016
4736257
Proposed fix to MAVEN-206 : cascade system and user properties to the…
Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archetypes/liferay-ext-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-hook-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-layouttpl-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-icefaces-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-jsf-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-primefaces-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-richfaces-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-portlet-spring-mvc-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-servicebuilder-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-theme-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/liferay-web-archetype/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions plugins/liferay-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.liferay.maven</groupId>
<version>6.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.plugins</groupId>
<artifactId>liferay-maven-plugin</artifactId>
<version>6.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Liferay Maven Plugin</name>
<description>Contains goals to manage Liferay plugins.</description>
Expand Down
6 changes: 5 additions & 1 deletion ...iferay-maven-plugin/src/main/java/com/liferay/maven/plugins/AbstractToolsLiferayMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,11 @@ protected MavenProject resolveProject(Artifact artifact) throws Exception {

projectBuildingRequest.setActiveProfileIds(activeProfileIds);
projectBuildingRequest.setProfiles(
mavenExecutionRequest.getProfiles());
mavenExecutionRequest.getProfiles());
projectBuildingRequest.getSystemProperties()
.putAll(mavenExecutionRequest.getSystemProperties());
projectBuildingRequest.getUserProperties()
.putAll(mavenExecutionRequest.getUserProperties());

ProjectBuildingResult projectBuildingResult = projectBuilder.build(
pomArtifact, true, projectBuildingRequest);
Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
View file
Open in desktop
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.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
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 Support</name>
<version>6.2.5</version>
<version>6.2.5.1-SNAPSHOT</version>
<description>Parent project to support Maven subprojects.</description>
<url>http://www.liferay.com</url>
<developers>
Expand Down