Skip to content

Commit

Permalink
LPS-0 Split up release properties differently for CE and DXP
Browse files Browse the repository at this point in the history
  • Loading branch information
CAustin582 authored and brianchandotcom committed Feb 2, 2022
1 parent 0e92502 commit 15b9898
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 9 deletions.
8 changes: 6 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,12 @@ lp.version=${lp.version[@{to.branch.name}]}
release.info.build=${release.info.build[@{to.branch.name}]}
release.info.date=${release.info.date[@{to.branch.name}]}
release.info.name=${release.info.name[@{to.branch.name}]}
release.info.version=${release.info.version[@{to.branch.name}]}
release.info.version.display.name=${release.info.version.display.name[@{to.branch.name}]}</echo>
release.info.version.major=${release.info.version.major[@{to.branch.name}]}
release.info.version.minor=${release.info.version.minor[@{to.branch.name}]}
release.info.version.bug.fix=${release.info.version.bug.fix[@{to.branch.name}]}
release.info.version=${release.info.version.major[@{to.branch.name}]}.${release.info.version.minor[@{to.branch.name}]}.${release.info.version.bug.fix[@{to.branch.name}]}
release.info.version.display.name=${release.info.version.display.name[@{to.branch.name}]}
release.info.version.file.suffix=${release.info.version.file.suffix[@{to.branch.name}]}</echo>

<!-- sql/sql.profile-dxp.properties -->

Expand Down
42 changes: 35 additions & 7 deletions release.properties
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,14 @@
release.info.build=7403
release.info.date=February 4, 2022
release.info.name=Liferay Community Edition Portal
release.info.version=7.4.3.10

release.info.version.major=7
release.info.version.minor=4
release.info.version.bug.fix=3
release.info.version.trivial=10

release.info.version=${release.info.version.major}.${release.info.version.minor}.${release.info.version.bug.fix}.${release.info.version.trivial}

release.info.version.display.name=${release.info.version} CE GA10

release.info.build[7.0.x-private]=7010
Expand All @@ -80,12 +87,26 @@
release.info.name[7.4.x-private]=Liferay Digital Experience Platform
release.info.name[master-private]=Liferay Digital Experience Platform

release.info.version[7.0.x-private]=7.0.10
release.info.version[7.1.x-private]=7.1.10
release.info.version[7.2.x-private]=7.2.10
release.info.version[7.3.x-private]=7.3.10
release.info.version[7.4.x-private]=${release.info.version[master-private]}
release.info.version[master-private]=7.4.13
release.info.version.major[7.0.x-private]=7
release.info.version.major[7.1.x-private]=7
release.info.version.major[7.2.x-private]=7
release.info.version.major[7.3.x-private]=7
release.info.version.major[7.4.x-private]=${release.info.version.major[master-private]}
release.info.version.major[master-private]=7

release.info.version.minor[7.0.x-private]=0
release.info.version.minor[7.1.x-private]=1
release.info.version.minor[7.2.x-private]=2
release.info.version.minor[7.3.x-private]=3
release.info.version.minor[7.4.x-private]=${release.info.version.minor[master-private]}
release.info.version.minor[master-private]=4

release.info.version.bug.fix[7.0.x-private]=10
release.info.version.bug.fix[7.1.x-private]=10
release.info.version.bug.fix[7.2.x-private]=10
release.info.version.bug.fix[7.3.x-private]=10
release.info.version.bug.fix[7.4.x-private]=${release.info.version.bug.fix[master-private]}
release.info.version.bug.fix[master-private]=13

release.info.version.display.name[7.0.x-private]=7.0.10 GA1
release.info.version.display.name[7.1.x-private]=7.1.10 GA1
Expand All @@ -94,6 +115,13 @@
release.info.version.display.name[7.4.x-private]=${release.info.version.display.name[master-private]}
release.info.version.display.name[master-private]=7.4.13 Update 6

release.info.version.file.suffix[7.0.x-private]=-ga1
release.info.version.file.suffix[7.1.x-private]=-ga1
release.info.version.file.suffix[7.2.x-private]=-ga1
release.info.version.file.suffix[7.3.x-private]=-sp3
release.info.version.file.suffix[7.4.x-private]=${release.info.version.file.suffix[master-private]}
release.info.version.file.suffix[master-private]=.u6

##
## Release Source
##
Expand Down

0 comments on commit 15b9898

Please sign in to comment.