Skip to content

Commit

Permalink
Merge branch 'liferay:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@liferay-frontend
liferay-frontend committed Oct 9, 2023
2 parents dc35b42 + 05f2b44 commit 04d6440
Show file tree
Hide file tree
Showing 3,430 changed files with 35,131 additions and 76,288 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
83 changes: 83 additions & 0 deletions LICENSES/IPA.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
IPA Font License Agreement v1.0

The Licensor provides the Licensed Program (as defined in Article 1 below) under the terms of this license agreement ("Agreement"). Any use, reproduction or distribution of the Licensed Program, or any exercise of rights under this Agreement by a Recipient (as defined in Article 1 below) constitutes the Recipient's acceptance of this Agreement.

Article 1 (Definitions)

1. "Digital Font Program" shall mean a computer program containing, or used to render or display fonts.

2. "Licensed Program" shall mean a Digital Font Program licensed by the Licensor under this Agreement.

3. "Derived Program" shall mean a Digital Font Program created as a result of a modification, addition, deletion, replacement or any other adaptation to or of a part or all of the Licensed Program, and includes a case where a Digital Font Program newly created by retrieving font information from a part or all of the Licensed Program or Embedded Fonts from a Digital Document File with or without modification of the retrieved font information.

4. "Digital Content" shall mean products provided to end users in the form of digital data, including video content, motion and/or still pictures, TV programs or other broadcasting content and products consisting of character text, pictures, photographic images, graphic symbols and/or the like.

5. "Digital Document File" shall mean a PDF file or other Digital Content created by various software programs in which a part or all of the Licensed Program becomes embedded or contained in the file for the display of the font ("Embedded Fonts"). Embedded Fonts are used only in the display of characters in the particular Digital Document File within which they are embedded, and shall be distinguished from those in any Digital Font Program, which may be used for display of characters outside that particular Digital Document File.

6. "Computer" shall include a server in this Agreement.

7. "Reproduction and Other Exploitation" shall mean reproduction, transfer, distribution, lease, public transmission, presentation, exhibition, adaptation and any other exploitation.

8. "Recipient" shall mean anyone who receives the Licensed Program under this Agreement, including one that receives the Licensed Program from a Recipient.

Article 2 (Grant of License)

The Licensor grants to the Recipient a license to use the Licensed Program in any and all countries in accordance with each of the provisions set forth in this Agreement. However, any and all rights underlying in the Licensed Program shall be held by the Licensor. In no sense is this Agreement intended to transfer any right relating to the Licensed Program held by the Licensor except as specifically set forth herein or any right relating to any trademark, trade name, or service mark to the Recipient.

1. The Recipient may install the Licensed Program on any number of Computers and use the same in accordance with the provisions set forth in this Agreement.

2. The Recipient may use the Licensed Program, with or without modification in printed materials or in Digital Content as an expression of character texts or the like.

3. The Recipient may conduct Reproduction and Other Exploitation of the printed materials and Digital Content created in accordance with the preceding Paragraph, for commercial or non-commercial purposes and in any form of media including but not limited to broadcasting, communication and various recording media.

4. If any Recipient extracts Embedded Fonts from a Digital Document File to create a Derived Program, such Derived Program shall be subject to the terms of this agreement.

5. If any Recipient performs Reproduction or Other Exploitation of a Digital Document File in which Embedded Fonts of the Licensed Program are used only for rendering the Digital Content within such Digital Document File then such Recipient shall have no further obligations under this Agreement in relation to such actions.

6. The Recipient may reproduce the Licensed Program as is without modification and transfer such copies, publicly transmit or otherwise redistribute the Licensed Program to a third party for commercial or non-commercial purposes ("Redistribute"), in accordance with the provisions set forth in Article 3 Paragraph 2.

7. The Recipient may create, use, reproduce and/or Redistribute a Derived Program under the terms stated above for the Licensed Program: provided, that the Recipient shall follow the provisions set forth in Article 3 Paragraph 1 when Redistributing the Derived Program.

Article 3 (Restriction)

The license granted in the preceding Article shall be subject to the following restrictions:

1. If a Derived Program is Redistributed pursuant to Paragraph 4 and 7 of the preceding Article, the following conditions must be met :

(1) The following must be also Redistributed together with the Derived Program, or be made available online or by means of mailing mechanisms in exchange for a cost which does not exceed the total costs of postage, storage medium and handling fees:

(a) a copy of the Derived Program; and

(b) any additional file created by the font developing program in the course of creating the Derived Program that can be used for further modification of the Derived Program, if any.

(2) It is required to also Redistribute means to enable recipients of the Derived Program to replace the Derived Program with the Licensed Program first released under this License (the "Original Program"). Such means may be to provide a difference file from the Original Program, or instructions setting out a method to replace the Derived Program with the Original Program.

(3) The Recipient must license the Derived Program under the terms and conditions of this Agreement.

(4) No one may use or include the name of the Licensed Program as a program name, font name or file name of the Derived Program.

(5) Any material to be made available online or by means of mailing a medium to satisfy the requirements of this paragraph may be provided, verbatim, by any party wishing to do so.

2. If the Recipient Redistributes the Licensed Program pursuant to Paragraph 6 of the preceding Article, the Recipient shall meet all of the following conditions:

(1) The Recipient may not change the name of the Licensed Program.

(2) The Recipient may not alter or otherwise modify the Licensed Program.

(3) The Recipient must attach a copy of this Agreement to the Licensed Program.

3. THIS LICENSED PROGRAM IS PROVIDED BY THE LICENSOR "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTY AS TO THE LICENSED PROGRAM OR ANY DERIVED PROGRAM, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO EVENT SHALL THE LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXTENDED, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO; PROCUREMENT OF SUBSTITUTED GOODS OR SERVICE; DAMAGES ARISING FROM SYSTEM FAILURE; LOSS OR CORRUPTION OF EXISTING DATA OR PROGRAM; LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE INSTALLATION, USE, THE REPRODUCTION OR OTHER EXPLOITATION OF THE LICENSED PROGRAM OR ANY DERIVED PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

4. The Licensor is under no obligation to respond to any technical questions or inquiries, or provide any other user support in connection with the installation, use or the Reproduction and Other Exploitation of the Licensed Program or Derived Programs thereof.

Article 4 (Termination of Agreement)

1. The term of this Agreement shall begin from the time of receipt of the Licensed Program by the Recipient and shall continue as long as the Recipient retains any such Licensed Program in any way.

2. Notwithstanding the provision set forth in the preceding Paragraph, in the event of the breach of any of the provisions set forth in this Agreement by the Recipient, this Agreement shall automatically terminate without any notice. In the case of such termination, the Recipient may not use or conduct Reproduction and Other Exploitation of the Licensed Program or a Derived Program: provided that such termination shall not affect any rights of any other Recipient receiving the Licensed Program or the Derived Program from such Recipient who breached this Agreement.

Article 5 (Governing Law)

1. IPA may publish revised and/or new versions of this License. In such an event, the Recipient may select either this Agreement or any subsequent version of the Agreement in using, conducting the Reproduction and Other Exploitation of, or Redistributing the Licensed Program or a Derived Program. Other matters not specified above shall be subject to the Copyright Law of Japan and other related laws and regulations of Japan.

2. This Agreement shall be construed under the laws of Japan.
48 changes: 48 additions & 0 deletions build-dist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,54 @@ fi
</echo>
</then>
</if>

<echo file="${liferay.home}/glowroot/admin.json"><![CDATA[{
"roles": [
{
"name": "Administrator",
"permissions": [
"admin",
"agent:config",
"agent:error",
"agent:incident",
"agent:jvm",
"agent:transaction"
]
}
],
"storage": {
"fullQueryTextExpirationHours": 336,
"rollupCappedDatabaseSizesMb": [
500,
500,
500,
500
],
"rollupExpirationHours": [
72,
336,
2160,
2160
],
"traceCappedDatabaseSizeMb": 500,
"traceExpirationHours": 336
},
"users": [
{
"roles": [
"Administrator"
],
"username": "anonymous"
}
],
"web": {
"bindAddress": "127.0.0.1",
"contextPath": "/o/glowroot",
"port": 4000,
"sessionCookieName": "GLOWROOT_SESSION_ID",
"sessionTimeoutMinutes": 30
}
}]]></echo>
</target>

<target name="unzip-jboss">
Expand Down
1 change: 1 addition & 0 deletions build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
# apps/frontend-theme,\
# apps/frontend-token,\
# apps/frontend-view-state,\
# apps/glowroot,\
# apps/gogo-shell,\
# apps/google-places,\
# apps/headless,\
Expand Down
13 changes: 12 additions & 1 deletion modules/.releng/apps/accessibility/app.changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,15 @@ app.artifacts-1.0.5=\

app.change.log-1.0.5=LPS-187203 LPS-187559 LPS-187704 LPS-187797 LPS-187798 LPS-187799 LPS-187952 LPS-188023 LPS-188266 LPS-188270 LPS-188275 LPS-188743 LPS-188912 LPS-190311 LPS-190405 LPS-190444 LPS-192336 LPS-192338 LPS-192545 LPS-193480 LPS-194560

app.git.id-1.0.5=b61e68c2bb7481b0ebc2dc7d258c6d57fb9cf6d1
app.git.id-1.0.5=b61e68c2bb7481b0ebc2dc7d258c6d57fb9cf6d1

#
# Liferay App Version 1.0.6
#

app.artifacts-1.0.6=\


app.change.log-1.0.6=LPS-187203 LPS-187559 LPS-187704 LPS-187797 LPS-187798 LPS-187799 LPS-187952 LPS-188023 LPS-188266 LPS-188270 LPS-188275 LPS-188743 LPS-188912 LPS-190311 LPS-190405 LPS-190444 LPS-192336 LPS-192338 LPS-192545 LPS-193480 LPS-194560

app.git.id-1.0.6=9ec0faddc104dcdb5dc2effd7951c894cde65483
2 changes: 1 addition & 1 deletion modules/.releng/apps/accessibility/app.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app.marketplace.id=
app.marketplace.title=Liferay CE Accessibility
app.marketplace.version=1.0.5
app.marketplace.version=1.0.6
app.portal.build=7403
10 changes: 5 additions & 5 deletions modules/.releng/apps/account/account-admin-web/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
artifact.git.id=a063d8c49dd293cb56690e2dc1ec2c9b3cbacf97
artifact.jsdoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.103/com.liferay.account.admin.web-2.0.103-jsdoc.jar
artifact.jspc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.103/com.liferay.account.admin.web-2.0.103-jspc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.103/com.liferay.account.admin.web-2.0.103-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.103/com.liferay.account.admin.web-2.0.103.jar
artifact.git.id=e8b2c4efd417b444f2242f932840eb4706528f8a
artifact.jsdoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.104/com.liferay.account.admin.web-2.0.104-jsdoc.jar
artifact.jspc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.104/com.liferay.account.admin.web-2.0.104-jspc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.104/com.liferay.account.admin.web-2.0.104-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.admin.web/2.0.104/com.liferay.account.admin.web-2.0.104.jar
7 changes: 6 additions & 1 deletion modules/.releng/apps/account/account-admin-web/liferay-releng.changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,9 @@ ca0db487227dcea2d6c82c2b398cfd69f308ba8b^..5c3b4c369afe41d2549219951ae6be1a5b278
#
# Bundle Version 2.0.103
#
5c3b4c369afe41d2549219951ae6be1a5b278a4f^..bd4df620351121a09725b2b3366b8be1c37e9201=LPS-192545 LPS-195917 LPS-195965
5c3b4c369afe41d2549219951ae6be1a5b278a4f^..bd4df620351121a09725b2b3366b8be1c37e9201=LPS-192545 LPS-195917 LPS-195965

#
# Bundle Version 2.0.104
#
bd4df620351121a09725b2b3366b8be1c37e9201^..47d7c9082b07253371bd9d4474e795ad8b211d70=LPS-192842 LPS-195671 LPS-195966 LPS-195970 LPS-196357 LPS-196524
6 changes: 3 additions & 3 deletions modules/.releng/apps/account/account-service/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifact.git.id=d053d8770a326b383c700331350f4942fa64dfc3
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.service/2.0.109/com.liferay.account.service-2.0.109-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.service/2.0.109/com.liferay.account.service-2.0.109.jar
artifact.git.id=27bed0f6381ab97b782417bf4233d3590de66494
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.service/2.0.110/com.liferay.account.service-2.0.110-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.account.service/2.0.110/com.liferay.account.service-2.0.110.jar
7 changes: 6 additions & 1 deletion modules/.releng/apps/account/account-service/liferay-releng.changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,9 @@ da454ac796205cbf30e387077203f24ae6710b06^..43aa770cc028b357a974e839ca664ae53f320
#
# Bundle Version 2.0.109
#
25e0674147bc93a8890ac70105934ca141e83c76^..f6cad83d087c4ead56552fe3419434d21968408d=LPS-188270 LPS-191218 LPS-193154
25e0674147bc93a8890ac70105934ca141e83c76^..f6cad83d087c4ead56552fe3419434d21968408d=LPS-188270 LPS-191218 LPS-193154

#
# Bundle Version 2.0.110
#
f6cad83d087c4ead56552fe3419434d21968408d^..935619c5707b51e547b7a669be73629fa2e3f1d2=LPS-194389 LPS-195966 LPS-195970 LPS-196054
13 changes: 12 additions & 1 deletion modules/.releng/apps/account/app.changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1019,4 +1019,15 @@ app.artifacts-2.0.89=\

app.change.log-2.0.89=[[trimmed]]LPS-170002 LPS-170119 LPS-170150 LPS-170355 LPS-170474 LPS-170700 LPS-171215 LPS-171288 LPS-172239 LPS-172772 LPS-173537 LPS-174032 LPS-174051 LPS-174100 LPS-174101 LPS-174215 LPS-174314 LPS-174324 LPS-174535 LPS-174544 LPS-175377 LPS-175504 LPS-176003 LPS-176492 LPS-176938 LPS-177798 LPS-178158 LPS-178826 LPS-178978 LPS-179093 LPS-179214 LPS-179688 LPS-179802 LPS-179814 LPS-180148 LPS-180239 LPS-180284 LPS-180671 LPS-181517 LPS-182721 LPS-183730 LPS-183792 LPS-184791 LPS-184905 LPS-185465 LPS-185667 LPS-186204 LPS-186839 LPS-187559 LPS-187901 LPS-188270 LPS-188300 LPS-188912 LPS-189686 LPS-189793 LPS-191218 LPS-192545 LPS-192701 LPS-192731 LPS-193154 LPS-193211 LPS-194074 LPS-195526 LPS-195917 LPS-195965 LPS-67565 LPS-77699 LPS-86806 LPS-95835 LPS-97343 LPS-97365 LPS-97616 LPS-97651 LPS-97652 LPS-97653 LPS-98387 LPS-98849 LPS-98850 LPS-98879 LPS-99252 LPS-99391 LPS-99431 LPS-99434 LPS-99435 LPS-99807 LPS-99839 LPS-99898 LPS-99914 LRAC-12695 LRAC-12757 LRAC-12758 LRDOCS-8120 LRQA-51488

app.git.id-2.0.89=b61e68c2bb7481b0ebc2dc7d258c6d57fb9cf6d1
app.git.id-2.0.89=b61e68c2bb7481b0ebc2dc7d258c6d57fb9cf6d1

#
# Liferay App Version 2.0.90
#

app.artifacts-2.0.90=\


app.change.log-2.0.90=[[trimmed]]LPS-172239 LPS-172772 LPS-173537 LPS-174032 LPS-174051 LPS-174100 LPS-174101 LPS-174215 LPS-174314 LPS-174324 LPS-174535 LPS-174544 LPS-175377 LPS-175504 LPS-176003 LPS-176492 LPS-176938 LPS-177798 LPS-178158 LPS-178826 LPS-178978 LPS-179093 LPS-179214 LPS-179688 LPS-179802 LPS-179814 LPS-180148 LPS-180239 LPS-180284 LPS-180671 LPS-181517 LPS-182721 LPS-183730 LPS-183792 LPS-184791 LPS-184905 LPS-185465 LPS-185667 LPS-186204 LPS-186839 LPS-187559 LPS-187901 LPS-188270 LPS-188300 LPS-188912 LPS-189686 LPS-189793 LPS-191218 LPS-192545 LPS-192701 LPS-192731 LPS-192842 LPS-193154 LPS-193211 LPS-194074 LPS-194389 LPS-195526 LPS-195671 LPS-195917 LPS-195965 LPS-195966 LPS-195970 LPS-196054 LPS-196357 LPS-196524 LPS-67565 LPS-77699 LPS-86806 LPS-95835 LPS-97343 LPS-97365 LPS-97616 LPS-97651 LPS-97652 LPS-97653 LPS-98387 LPS-98849 LPS-98850 LPS-98879 LPS-99252 LPS-99391 LPS-99431 LPS-99434 LPS-99435 LPS-99807 LPS-99839 LPS-99898 LPS-99914 LRAC-12695 LRAC-12757 LRAC-12758 LRDOCS-8120 LRQA-51488

app.git.id-2.0.90=9ec0faddc104dcdb5dc2effd7951c894cde65483
2 changes: 1 addition & 1 deletion modules/.releng/apps/account/app.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app.marketplace.id=170642210
app.marketplace.title=Liferay CE Account
app.marketplace.version=2.0.89
app.marketplace.version=2.0.90
app.portal.build=7403
6 changes: 3 additions & 3 deletions ...releng/apps/adaptive-media/adaptive-media-document-library-thumbnails/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifact.git.id=5cf595310e7c36bfd91e3db868dc7c576ebcff73
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.adaptive.media.document.library.thumbnails/5.0.32/com.liferay.adaptive.media.document.library.thumbnails-5.0.32-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.adaptive.media.document.library.thumbnails/5.0.32/com.liferay.adaptive.media.document.library.thumbnails-5.0.32.jar
artifact.git.id=1c04d7c89c678ea04786c1e1c8a322072beaa40b
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.adaptive.media.document.library.thumbnails/5.0.33/com.liferay.adaptive.media.document.library.thumbnails-5.0.33-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.adaptive.media.document.library.thumbnails/5.0.33/com.liferay.adaptive.media.document.library.thumbnails-5.0.33.jar
7 changes: 6 additions & 1 deletion ...g/apps/adaptive-media/adaptive-media-document-library-thumbnails/liferay-releng.changelog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,9 @@ f4726808bbb9e904c2d114514356bb3be924da9a^..17f9a9c11e98e3163e4ebb7faec63023de18f
#
# Bundle Version 5.0.32
#
ef8b1a09f09a43389b329c05cadd36193312c75d^..bee32e100f5dc897bcf614ae49372356fe9d4342=LPS-194076
ef8b1a09f09a43389b329c05cadd36193312c75d^..bee32e100f5dc897bcf614ae49372356fe9d4342=LPS-194076

#
# Bundle Version 5.0.33
#
bee32e100f5dc897bcf614ae49372356fe9d4342^..4e9ce7504cdfead18549f6abb1518e9f026725cf=LPS-196671 LPS-196814 LPS-196872
Loading

0 comments on commit 04d6440

Please sign in to comment.