Skip to content

Commit c293f18

Browse files
skumar7322skumar7322
committed
2022.2 Code Drop
1 parent 4db23c2 commit c293f18

File tree

4 files changed

+202
-129
lines changed

4 files changed

+202
-129
lines changed

‎LICENSE.txt

+84-35
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,41 @@
1-
Copyright (c) 2022, Perforce Software, Inc. All rights reserved.
1+
Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
2+
3+
4+
BY INSTALLING OR DOWNLOADING THE SOFTWARE, YOU ARE ACCEPTING AND AGREEING TO THE TERMS OF
5+
THIS END USER LICENSE AGREEMENT (THE "LICENSE AGREEMENT"), AND IT LEGALLY BINDS YOU AND
6+
YOUR EMPLOYER (COLLECTIVELY THE "LICENSEE"), AND PERFORCE SOFTWARE, INC., A DELAWARE
7+
CORPORATION ("PERFORCE"), TO THE TERMS AND CONDITIONS OF THE LICENSE AGREEMENT (INCLUDING
8+
ANY TERMS, CONDITIONS, AND RESTRICTIONS CONTAINED IN ANY ORDER RELATING TO THE SOFTWARE).
9+
IF THE LICENSEE DOES NOT ACCEPT AND AGREE TO THE TERMS AND CONDITIONS OF THE LICENSE
10+
AGREEMENT THEN DO NOT DOWNLOAD, INSTALL, OR OTHERWISE USE THE SOFTWARE.
11+
12+
THE RIGHT TO USE THE SOFTWARE IS CONDITIONAL UPON ACCEPTANCE OF THE LICENSE AGREEMENT,
13+
UNLESS THE LICENSEE HAS ENTERED INTO A WRITTEN AND DULY SIGNED LICENSE AGREEMENT WITH
14+
PERFORCE, IN WHICH CASE SUCH SIGNED LICENSE AGREEMENT WILL GOVERN THE LICENSEE'S USE OF
15+
THE SOFTWARE.
216

317
Redistribution and use in source and binary forms, with or without modification, are
418
permitted provided that the following conditions are met:
519

20+
21+
622
1. Redistributions of source code must retain the above copyright notice, this list of
723
conditions and the following disclaimer.
824

25+
26+
927
2. Redistributions in binary form must reproduce the above copyright notice, this list of
1028
conditions and the following disclaimer in the documentation and/or other materials
1129
provided with the distribution.
1230

31+
32+
1333
3. Neither the name of the copyright holder nor the names of its contributors may be used
1434
to endorse or promote products derived from this software without specific prior written
1535
permission.
1636

37+
38+
1739
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
1840
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
1941
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -27,6 +49,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2749
This distribution also includes the following third party software; please consult the
2850
accompanying license file for the license terms that apply to that software only:
2951

52+
commons-codec-1.15.jar
53+
Licenses:
54+
License: Apache 2.0
55+
Reference: https://repository.apache.org/content/repositories/releases/commons-codec/commons-codec/1.15/commons-codec-1.15.pom
56+
LicenseText: License Text Under Appendix
57+
58+
Copyrights:
59+
Copyright: Copyright The Apache Software Foundation
60+
Reference: https://commons.apache.org/
61+
3062
commons-compress-1.21.jar
3163
Licenses:
3264
License: Apache 2.0
@@ -64,27 +96,31 @@ commons-io-2.11.0.jar
6496
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/454db108-23ea-4a10-ab65-9a699dc34ab2
6597
Author: The Apache Software Foundation
6698

67-
commons-lang3-3.4.jar
99+
commons-lang3-3.12.0.jar
68100
Licenses:
69101
License: Apache 2.0
70-
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.pom
102+
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.pom
71103
LicenseText: License Text Under Appendix
72104

73105
Copyrights:
74-
Copyright: Copyright 2001-2015 The Apache Software Foundation
75-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/93e762c7-d7d9-46dc-94cc-1e3ff8315f90
106+
Copyright: Copyright 2001-2021 The Apache Software Foundation
107+
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/11239b3a-f2b6-4016-bd0c-c0ce1d0fa09e
76108
Author: The Apache Software Foundation
77109

78-
jsr305-3.0.1.jar
110+
jsr305-3.0.2.jar
79111
Licenses:
80112
License: Apache 2.0
81-
Reference: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.pom
113+
Reference: https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
82114
LicenseText: License Text Under Appendix
83115

116+
Copyrights:
117+
Copyright: Copyright 2012 http://findbugs.sourceforge.net/
118+
Reference: University of Maryland
119+
84120
jzlib-1.1.3.jar
85121
Licenses:
86122
License: BSD 3
87-
Reference: http://www.jcraft.com/jzlib/LICENSE.txt
123+
Reference: https://repo.maven.apache.org/maven2/com/jcraft/jzlib/1.1.3/jzlib-1.1.3.pom
88124
LicenseText: License Text Under Appendix
89125

90126
Copyrights:
@@ -104,56 +140,69 @@ jzlib-1.1.3.jar
104140
Reference: http://www.jcraft.com/jzlib/LICENSE.txt
105141
Author: ymnk
106142

107-
log4j-api-2.17.2.jar
143+
log4j-api-2.19.0.jar
108144
Licenses:
109145
License: Apache 2.0
110-
Reference: https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.17.2/log4j-api-2.17.2.pom
146+
Reference: https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.pom
111147
LicenseText: License Text Under Appendix
112148

113149
Copyrights:
114150
Copyright: Copyright 1999-2022 The Apache Software Foundation
115-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/11ff36bb-74e4-4404-8ea1-c0c17b82afb0
151+
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/3e0941b0-3f7f-481b-b30c-ad1ae9a2e18d
116152
Author: The Apache Software Foundation
117153

118-
log4j-core-2.17.2.jar
154+
log4j-core-2.19.0.jar
119155
Licenses:
120156
License: Apache 2.0
121-
Reference: https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-core/2.17.2/log4j-core-2.17.2.pom
157+
Reference: https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.pom
122158
LicenseText: License Text Under Appendix
123159

124160
Copyrights:
125-
Copyright: Copyright 2005-2006 Tim Fennell
126-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/795aa7d2-cc30-43d4-a873-1e138bce13d9
127-
Author: Tim Fennell
128-
129-
Copyright: Copyright 1999-2012 Apache Software Foundation
130-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/795aa7d2-cc30-43d4-a873-1e138bce13d9
131-
Author: Apache Software Foundation
161+
Copyright: Copyright 2022 The Apache Software Foundation
162+
Reference: https://logging.apache.org/log4j/2.x/
132163

133-
Copyright: Copyright 1999-2005 The Apache Software Foundation
134-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/0078c017-0d59-4ba4-95f8-5c312d333383
135-
Author: The Apache Software Foundation
136-
137-
p4java-2021.2.2240592.jar
164+
p4java-2022.2.2444480.jar
138165
Licenses:
139-
License: Proprietary
140-
Reference: http://www.perforce.com/
166+
License: BSD 3
167+
Reference: https://repo.maven.apache.org/maven2/com/perforce/p4java/2022.2.2444480/p4java-2022.2.2444480.pom
141168
LicenseText: License Text Under Appendix
142169

143170
Copyrights:
144-
Copyright: Copyright 2005-2015 Perforce Software
145-
Reference: https://swarm.workshop.perforce.com/files/guest/perforce_software/p4java/main/samples/license.txt
146-
Author: Perforce Software
147-
148-
Appendix:
149-
-----------
150-
Proprietary
151-
-----------
171+
Copyright: Copyright 2023 Perforce Software, Inc
172+
Reference: https://www.perforce.com/perforce/doc.current/user/p4java_eula.txt
173+
Author: Perforce Software, Inc
152174

153175

176+
Appendix:
154177
-----
155178
BSD 3
156179
-----
180+
Copyright (c) {{YEAR}}, {{OWNER}}
181+
All rights reserved.
182+
183+
Redistribution and use in source and binary forms, with or without modification, are
184+
permitted provided that the following conditions are met:
185+
186+
Redistributions of source code must retain the above copyright notice, this list of
187+
conditions and the following disclaimer.
188+
189+
Redistributions in binary form must reproduce the above copyright notice, this list of
190+
conditions and the following disclaimer in the documentation and/or other materials
191+
provided with the distribution.
192+
193+
Neither the name of {{the ORGANIZATION nor the names of its contributors}} may be used to
194+
endorse or promote products derived from this software without specific prior written
195+
permission.
196+
197+
THIS SOFTWARE IS PROVIDED BY {{THE COPYRIGHT HOLDERS AND CONTRIBUTORS}} "AS IS" AND ANY
198+
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
199+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
200+
{{THE COPYRIGHT HOLDER OR CONTRIBUTORS}} BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
201+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
202+
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
203+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
204+
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
205+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
157206

158207

159208
----------

‎RELNOTES.txt

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Release Notes for
22
P4SL, the Helix Core (Perforce) Plugin for Simulink and Matlab
33

4-
Version 2021.2
4+
Version 2022.2
55

66
Introduction
77

@@ -62,6 +62,30 @@ Known Limitations
6262
<java-home>/lib/security/local_policy.jar
6363
<java-home>/lib/security/US_export_policy.jar
6464

65+
-------------------------------------------
66+
Major new functionality in 2022.2 (2022.2/2447215) (2023/05/30)
67+
68+
#2445997 (Job #114818, #115704)
69+
Updated P4Java version to P4Java 2022.2.2444480
70+
71+
Upgraded P4SL to use Simulink R2023a APIs.
72+
73+
-------------------------------------------
74+
Major new functionality in 2022.1 Patch 1 (2022.1/2393090) (2023/01/17)
75+
76+
#2391906 (Job #113987)
77+
Updated P4Java version to P4Java 2022.1.2390907
78+
79+
-------------------------------------------
80+
Major new functionality in 2022.1 (2022.1/2355860) (2022/10/13)
81+
82+
#2354278 (Job #112759)
83+
Use the versions of api.jar and util.jar corresponding to Matlab R2022b
84+
85+
#2354234 (Job #112726)
86+
Updated P4Java version to P4Java 2022.1.2350821
87+
88+
6589
-------------------------------------------
6690
Major new functionality in 2021.2
6791

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ configurations {
2828
// and configurations.runtimeClasspath respectively
2929
dependencies {
3030
implementation files( 'libs/api.jar', 'libs/util.jar' )
31-
implementation 'com.perforce:p4java:2021.2.2278127'
32-
implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
33-
implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
31+
implementation 'com.perforce:p4java:2022.2.2444480'
32+
implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
33+
implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
3434
implementation 'commons-io:commons-io:2.11.0'
3535
implementation 'org.apache.commons:commons-exec:1.3'
3636
implementation 'org.apache.commons:commons-compress:1.21'

0 commit comments

Comments
 (0)