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

6.1.x #9

Open
wants to merge 115 commits into
base: 6.1.x
Choose a base branch
from
Open

6.1.x #9

wants to merge 115 commits into from

Conversation

nonontb
Copy link

@nonontb nonontb commented Apr 2, 2013

Two small commits:

  • Add a parameter in the Theme Mojo to force the use of the portal-web dependency. It helps to build Liferay from CI server
  • Filter ext-web to prevent deploy on this module. It seems a bug to deploy an incomplete WAR when running liferay:deploy from Ext archetype root

CAustin582 and others added 30 commits March 7, 2012 17:08
@CAustin582
Prepare 6.1.10 release
6934cfd
@CAustin582
[maven-release-plugin] prepare release 6.1.10
60f3da5
@CAustin582
[maven-release-plugin] prepare for next development iteration
5f957b0
@mikakoivisto @brianchandotcom
MAVEN-16
3a5740f
@mikakoivisto @brianchandotcom
MAVEN-17
99ca736
@brianchandotcom
MAVEN-17 Source formatting
4c94e96
@brianchandotcom
Update year
4ca248f
@mikakoivisto @brianchandotcom
MAVEN-18 Process ext direct deploy correctly
b76cf78
@mikakoivisto @brianchandotcom
MAVEN-18 Source Format
1e9c025
@brianchandotcom
MAVEN-18 Source formatting
ac25563
@brianchandotcom
MAVEN-20: configurable dist management section
52beaf9
@mikakoivisto @brianchandotcom
MAVEN-20 Source format
8d22a2a
@mikakoivisto @brianchandotcom
MAVEN-21 Warn about ServiceBuilder usage on ext plugin similarly to P…
0b56af6 
…lugins SDK
@brianchandotcom
MAVEN-21 Source formatting
35f134c
@mikakoivisto @brianchandotcom
MAVEN-22 Allow adding version and classifier to dependency jar name
068eb84
@brianchandotcom
MAVEN-22 Source formatting
0a6a91a
@mikakoivisto @brianchandotcom
MAVEN-23 Extract common logic
14bd815
@mikakoivisto @brianchandotcom
MAVEN-23 Apply new base class
86c4109
@mikakoivisto @brianchandotcom
MAVEN-23 Implement DBBuilderMojo
2ef6661
@mikakoivisto @brianchandotcom
MAVEN-23 Prevent initialization problems when running multiple goals
aebb782
@brianchandotcom
MAVEN-23 Source formatting
563f33c
@mikakoivisto @brianchandotcom
MAVEN-24 Add SassToCssBuilder
bf2020f
@mikakoivisto @brianchandotcom
MAVEN-24 Get rid of Maven warnings
603ad40
@brianchandotcom
MAVEN-24 Source formatting
6def4cd
@tmoreira2020 @brianchandotcom
MAVEN-26 Change the scope of Liferay dependencies to provided
ed76c75
@tmoreira2020 @brianchandotcom
MAVEN-26 Fix name of the archetype
8f52d87
@tmoreira2020 @brianchandotcom
MAVEN-27 Refactored the ext direct-deploy to process submodules indep…
3c474d4 
…endently
@tmoreira2020 @brianchandotcom
MAVEN-27 Fixed resolution of appServerClassesPortal and appServerLibP…
24911dd 
…ortalDir fields
@mikakoivisto @brianchandotcom
MAVEN-27 Source format
29cef09
@mikakoivisto @brianchandotcom
MAVEN-27 Fix build-css
0b592e7
brianchandotcom and others added 29 commits May 7, 2013 16:40
@brianchandotcom
MAVEN-74 SF
8575917
@brianchandotcom
MAVEN-53 Sync with master
e4a1ad6
@brianchandotcom
Update to 6.1.1-SNAPSHOT
80eac16
@mikakoivisto @brianchandotcom
MAVEN-81 Disable XML validation so that the plugin works in offline mode
a5a0a7b
@ngriffin7a @brianchandotcom
MAVEN-78 Upgrade JSF portlet archetypes to Liferay Faces 3.1.2-ga3
d30f0fa
@ngriffin7a @brianchandotcom
MAVEN-78 Upgrade JSF portlet archetypes to Liferay Faces 3.1.2-ga3 (e…
56071b2 
…xclude jsp-api from icefaces dependency)
@brianchandotcom
MAVEN-78 Does order matter?
5ca685b
@brianchandotcom
MAVEN-78 SF
6584847
@brianchandotcom
Revert "MAVEN-78 Does order matter?"
ac4aac1 
This reverts commit 6f64832.
@ngriffin7a @brianchandotcom
MAVEN-82 Upgrade JSF portlet archetypes to Liferay Faces 3.1.3-ga4
b5dfccf
@mikakoivisto @brianchandotcom
MAVEN-83 Remove original before moving merged over it
0d20693
@brianchandotcom
SF
70b61f5
@mikakoivisto @brianchandotcom
MAVEN-84 FileUtil.move() doesn't act as you'd expect
11d9c00
@mikakoivisto @brianchandotcom
MAVEN-85 Load global dependencies only if not already loaded from bun…
fe40966 
…dle.
@brianchandotcom
MAVEN-85 SF
095a356
@mikakoivisto @brianchandotcom
MAVEN-88 Make sure tools classpath is first so that tools load correc…
b3dadb2 
…t portal.properties first
@ngriffin7a @brianchandotcom
MAVEN-86 Update XML descriptors in JSF portlet archetypes for better …
389ff25 
…compatibility with Liferay Faces GA4
@ngriffin7a @brianchandotcom
MAVEN-86 Update XML descriptors in JSF portlet archetypes for better …
f33db05 
…compatibility with Liferay Faces GA4 (SF)
Prepare 6.1.2 relase
1f60b5c
[maven-release-plugin] prepare release 6.1.2
c0aa5fa
[maven-release-plugin] prepare for next development iteration
242feca
Prepare 6.1.30 release
fea428a
[maven-release-plugin] prepare release 6.1.30
5f1bab9
[maven-release-plugin] prepare for next development iteration
4d57ed1
@nonontb
Merge remote-tracking branch 'upstream/6.1.x' into 6.1.x
008f460 
Conflicts:
	plugins/liferay-maven-plugin/src/main/java/com/liferay/maven/plugins/PluginDeployerMojo.java
@nonontb
Remove useless @OverRide
08c3cfb
@mikakoivisto @brianchandotcom
MAVEN-91 Include build-css goal on all portlet archetypes
5d1822b
@CAustin582
Prepare 6.1.2 release
fb93690
@nonontb
Merge remote-tracking branch 'upstream/6.1.x' into 6.1.x
169d52d 
Conflicts:
	archetypes/liferay-ext-archetype/pom.xml
	archetypes/liferay-hook-archetype/pom.xml
	archetypes/liferay-layouttpl-archetype/pom.xml
	archetypes/liferay-portlet-archetype/pom.xml
	archetypes/liferay-portlet-icefaces-archetype/pom.xml
	archetypes/liferay-portlet-jsf-archetype/pom.xml
	archetypes/liferay-portlet-liferay-faces-alloy-archetype/pom.xml
	archetypes/liferay-portlet-primefaces-archetype/pom.xml
	archetypes/liferay-portlet-richfaces-archetype/pom.xml
	archetypes/liferay-servicebuilder-archetype/pom.xml
	archetypes/liferay-theme-archetype/pom.xml
	archetypes/liferay-web-archetype/pom.xml
	archetypes/pom.xml
	plugins/liferay-maven-plugin/pom.xml
	plugins/pom.xml
	pom.xml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@nonontb @CAustin582 @mikakoivisto @brianchandotcom @tmoreira2020 @ngriffin7a @barrieselack @gamerson