Skip to content

Commit 0582f3b

Browse files
KuassimKuassim
authored
Merge pull request #11 from peterrsongg/springboot
Replacing Helidon with Springboot in Third Party Licenses.txt
2 parents 72ca66d + 0ab475c commit 0582f3b

File tree

2 files changed

+43
-60
lines changed

2 files changed

+43
-60
lines changed

‎MtdrSpring/frontend/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@emotion/react": "^11.8.1",
6+
"@emotion/react": "^11.9.0",
77
"@emotion/styled": "^11.8.1",
8-
"@mui/icons-material": "^5.4.4",
9-
"@mui/material": "^5.4.4",
10-
"@mui/styles": "^5.4.4",
11-
"moment": "^2.29.1",
8+
"@mui/icons-material": "^5.8.0",
9+
"@mui/material": "^5.8.0",
10+
"@mui/styles": "^5.7.0",
11+
"moment": "^2.29.3",
1212
"react": "^17.0.2",
1313
"react-dom": "^17.0.2",
14-
"react-moment": "^1.0.0",
14+
"react-moment": "^1.1.2",
1515
"react-scripts": "5.0.0",
16-
"typescript": "^4.6.3"
16+
"typescript": "^4.6.4"
1717
},
1818
"scripts": {
1919
"start": "react-scripts start",

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 36 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
104104
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
105105
SOFTWARE.
106106

107+
108+
___________________________________________________________________________________________________
109+
Emotion
110+
https://github.com/emotion-js/emotion
111+
MIT License
112+
113+
Copyright (c) Emotion team and other contributors
114+
115+
Permission is hereby granted, free of charge, to any person obtaining a copy
116+
of this software and associated documentation files (the "Software"), to deal
117+
in the Software without restriction, including without limitation the rights
118+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
119+
copies of the Software, and to permit persons to whom the Software is
120+
furnished to do so, subject to the following conditions:
121+
122+
The above copyright notice and this permission notice shall be included in all
123+
copies or substantial portions of the Software.
124+
125+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
126+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
127+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
128+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
129+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
130+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
131+
SOFTWARE.
132+
107133
___________________________________________________________________________________________________
108134
Staci
109135
https://github.com/maxjahn/staci
@@ -285,18 +311,7 @@ Apache License
285311

286312
END OF TERMS AND CONDITIONS
287313

288-
APPENDIX: How to apply the Apache License to your work.
289-
290-
To apply the Apache License to your work, attach the following
291-
boilerplate notice, with the fields enclosed by brackets "[]"
292-
replaced with your own identifying information. (Don't include
293-
the brackets!) The text should be enclosed in the appropriate
294-
comment syntax for the file format. We also recommend that a
295-
file or class name and description of purpose be included on the
296-
same "printed page" as the copyright notice for easier
297-
identification within third-party archives.
298-
299-
Copyright [yyyy] [name of copyright owner]
314+
Copyright 2004 Max Jahn
300315

301316
Licensed under the Apache License, Version 2.0 (the "License");
302317
you may not use this file except in compliance with the License.
@@ -310,13 +325,14 @@ Apache License
310325
See the License for the specific language governing permissions and
311326
limitations under the License.
312327
___________________________________________________________________________________________________
313-
Helidon SE
314-
https://github.com/oracle/helidon
315-
Helidon is available under Apache License 2.0.
328+
Springboot
329+
https://github.com/spring-projects/spring-boot
330+
Springboot is available under Apache License 2.0.
331+
316332

317-
Apache License
333+
Apache License
318334
Version 2.0, January 2004
319-
http://www.apache.org/licenses/
335+
https://www.apache.org/licenses/
320336

321337
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
322338

@@ -491,49 +507,16 @@ Helidon is available under Apache License 2.0.
491507

492508
END OF TERMS AND CONDITIONS
493509

494-
APPENDIX: How to apply the Apache License to your work.
495-
496-
To apply the Apache License to your work, attach the following
497-
boilerplate notice, with the fields enclosed by brackets "[]"
498-
replaced with your own identifying information. (Don't include
499-
the brackets!) The text should be enclosed in the appropriate
500-
comment syntax for the file format. We also recommend that a
501-
file or class name and description of purpose be included on the
502-
same "printed page" as the copyright notice for easier
503-
identification within third-party archives.
504-
505-
Copyright [yyyy] [name of copyright owner]
510+
Copyright 2004 Spring Projects
506511

507512
Licensed under the Apache License, Version 2.0 (the "License");
508513
you may not use this file except in compliance with the License.
509514
You may obtain a copy of the License at
510515

511-
http://www.apache.org/licenses/LICENSE-2.0
516+
https://www.apache.org/licenses/LICENSE-2.0
512517

513518
Unless required by applicable law or agreed to in writing, software
514519
distributed under the License is distributed on an "AS IS" BASIS,
515520
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
516521
See the License for the specific language governing permissions and
517-
limitations under the License.
518-
519-
NOTICE
520-
Project Helidon
521-
522-
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
523-
Licensed under the Apache License, Version 2.0 (the "License");
524-
you may not use this file except in compliance with the License.
525-
You may obtain a copy of the License at
526-
http://www.apache.org/licenses/LICENSE-2.0
527-
Unless required by applicable law or agreed to in writing, software
528-
distributed under the License is distributed on an "AS IS" BASIS,
529-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
530-
See the License for the specific language governing permissions and
531-
limitations under the License.
532-
==========================================================================
533-
Third Party Dependencies
534-
==========================================================================
535-
Helidon includes or depends on code from third party projects.
536-
Attributions are contained in THIRD_PARTY_LICENSES.txt. You can
537-
find a copy in the Helidon GitHub repository:
538-
https://github.com/oracle/helidon/blob/${project.version}/THIRD_PARTY_LICENSES.txt
539-
Or in the Helidon artifact: io.helidon.licensing:helidon-licensing:${project.version}____________________________________________________________________________________________________
522+
limitations under the License.

0 commit comments

Comments
 (0)