Skip to content

Commit 97815a5

Browse files
committed
2024.1 Code Drop
1 parent c293f18 commit 97815a5

File tree

3 files changed

+90
-66
lines changed

3 files changed

+90
-66
lines changed

LICENSE.txt

+15-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
1+
Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
22

33

44
BY INSTALLING OR DOWNLOADING THE SOFTWARE, YOU ARE ACCEPTING AND AGREEING TO THE TERMS OF
@@ -59,21 +59,17 @@ commons-codec-1.15.jar
5959
Copyright: Copyright The Apache Software Foundation
6060
Reference: https://commons.apache.org/
6161

62-
commons-compress-1.21.jar
62+
commons-compress-1.26.0.jar
6363
Licenses:
6464
License: Apache 2.0
65-
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.21/commons-compress-1.21.pom
65+
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.pom
6666
LicenseText: License Text Under Appendix
6767

6868
Copyrights:
69-
Copyright: Copyright 2002-2021 The Apache Software Foundation
70-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/7dcd678d-1798-4c01-9ce3-67fe6811a901
69+
Copyright: Copyright 2002-2024 The Apache Software Foundation
70+
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/ccebaff8-5316-4db3-9d3a-51e2951925c8
7171
Author: The Apache Software Foundation
7272

73-
Copyright: Copyright 1996-2019 Julian R Seward
74-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/7dcd678d-1798-4c01-9ce3-67fe6811a901
75-
Author: Julian R Seward
76-
7773
commons-exec-1.3.jar
7874
Licenses:
7975
License: Apache 2.0
@@ -85,26 +81,26 @@ commons-exec-1.3.jar
8581
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/1998c91e-7b23-43bb-845c-ea0d33b3920c
8682
Author: The Apache Software Foundation
8783

88-
commons-io-2.11.0.jar
84+
commons-io-2.15.1.jar
8985
Licenses:
9086
License: Apache 2.0
91-
Reference: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
87+
Reference: https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.pom
9288
LicenseText: License Text Under Appendix
9389

9490
Copyrights:
95-
Copyright: Copyright 2002-2021 The Apache Software Foundation
96-
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/454db108-23ea-4a10-ab65-9a699dc34ab2
91+
Copyright: Copyright 2002-2023 The Apache Software Foundation
92+
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/c37716e5-bcbe-452d-996a-1d9553fbc907
9793
Author: The Apache Software Foundation
9894

99-
commons-lang3-3.12.0.jar
95+
commons-lang3-3.14.0.jar
10096
Licenses:
10197
License: Apache 2.0
102-
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.pom
98+
Reference: https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.pom
10399
LicenseText: License Text Under Appendix
104100

105101
Copyrights:
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
102+
Copyright: Copyright 2001-2023 The Apache Software Foundation
103+
Reference: https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/25f33986-d48b-41f1-9e9e-74fbf5897a98
108104
Author: The Apache Software Foundation
109105

110106
jsr305-3.0.2.jar
@@ -161,17 +157,12 @@ log4j-core-2.19.0.jar
161157
Copyright: Copyright 2022 The Apache Software Foundation
162158
Reference: https://logging.apache.org/log4j/2.x/
163159

164-
p4java-2022.2.2444480.jar
160+
p4java-2024.1.2612262.jar
165161
Licenses:
166162
License: BSD 3
167-
Reference: https://repo.maven.apache.org/maven2/com/perforce/p4java/2022.2.2444480/p4java-2022.2.2444480.pom
163+
Reference: https://repo.maven.apache.org/maven2/com/perforce/p4java/2024.1.2612262/p4java-2024.1.2612262.pom
168164
LicenseText: License Text Under Appendix
169165

170-
Copyrights:
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
174-
175166

176167
Appendix:
177168
-----

RELNOTES.txt

+68-35
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 2022.2
4+
Version 2024.1
55

66
Introduction
77

@@ -22,7 +22,7 @@ Requirements
2222

2323
* Perforce server at Release 2017.1 or higher.
2424

25-
* Java: full standard JDK 8 or later. Implementation as
25+
* Java: full standard JDK 11 or later. Implementation as
2626
discussed in "Known Limitations" below.
2727

2828
* SSL: unlimited strength JCE (Java Cryptography Extension) package for
@@ -63,76 +63,109 @@ Known Limitations
6363
<java-home>/lib/security/US_export_policy.jar
6464

6565
-------------------------------------------
66-
Major new functionality in 2022.2 (2022.2/2447215) (2023/05/30)
66+
Major new functionality in 2024.1 (2024.1/2620571) (2024/07/02)
6767

68-
#2445997 (Job #114818, #115704)
69-
Updated P4Java version to P4Java 2022.2.2444480
68+
#2616732 (Job #121144 #121368)
69+
Updated P4Java version to P4Java 2024.1.2612262
70+
Updated Java version to 11.
71+
72+
#2617759 (Job #121369)
73+
Upgraded P4SL to use Simulink R2024a APIs.
74+
75+
#2616732 (Job #121424 #121142)
76+
Upgraded org.apache.commons:commons-compress:1.26.2 to
77+
address CVEs: CVE-2024-25710 and CVE-2024-26308
7078

71-
Upgraded P4SL to use Simulink R2023a APIs.
79+
80+
-------------------------------------------
81+
Major new functionality in 2023.2 (2023.2/2561373) (2024/02/23)
82+
83+
#2552541 (Job #119065)
84+
Updated P4Java version to P4Java 2023.2.2553500
85+
86+
-------------------------------------------
87+
Major new functionality in 2023.1 (2023.1/2518458) (2023/11/13)
88+
89+
#2513039 (Job #116936, #116996)
90+
Updated P4Java version to P4Java 2023.1.2512805
91+
92+
Upgraded P4SL to use Simulink R2023b APIs.
93+
94+
-------------------------------------------
95+
Major new functionality in 2022.2 (2022.2/2447215) (2023/05/30)
96+
97+
#2445997 (Job #114818, #115704)
98+
Updated P4Java version to P4Java 2022.2.2444480
99+
100+
Upgraded P4SL to use Simulink R2023a APIs.
72101

73102
-------------------------------------------
74103
Major new functionality in 2022.1 Patch 1 (2022.1/2393090) (2023/01/17)
75104

76-
#2391906 (Job #113987)
77-
Updated P4Java version to P4Java 2022.1.2390907
105+
#2391906 (Job #113987)
106+
Updated P4Java version to P4Java 2022.1.2390907
78107

79108
-------------------------------------------
80109
Major new functionality in 2022.1 (2022.1/2355860) (2022/10/13)
81110

82-
#2354278 (Job #112759)
83-
Use the versions of api.jar and util.jar corresponding to Matlab R2022b
111+
#2354278 (Job #112759)
112+
Use the versions of api.jar and util.jar corresponding to
113+
Matlab R2022b
84114

85-
#2354234 (Job #112726)
86-
Updated P4Java version to P4Java 2022.1.2350821
87-
115+
#2354234 (Job #112726)
116+
Updated P4Java version to P4Java 2022.1.2350821
88117

89118
-------------------------------------------
90119
Major new functionality in 2021.2
91120

92-
#2265417 (Bug #110045)
93-
Use the versions of api.jar and util.jar corresponding to Matlab R2022a
121+
#2265417 (Bug #110045)
122+
Use the versions of api.jar and util.jar corresponding to
123+
Matlab R2022a
94124

95-
#2266783 (Bug #109732)
96-
Update to the latest P4Java 2021.2
125+
#2266783 (Bug #109732)
126+
Update to the latest P4Java 2021.2
97127

98128
-------------------------------------------
99129
Major new functionality in 2020.1
100130

101-
#2007646 (Bug #103153)
102-
Upgraded P4SL to use Simulink R2020a APIs.
131+
#2007646 (Bug #103153)
132+
Upgraded P4SL to use Simulink R2020a APIs.
103133

104-
#2007498 (Bug #103133)
105-
Upgraded p4java api version to 2020.1.1999383.
134+
#2007498 (Bug #103133)
135+
Upgraded p4java api version to 2020.1.1999383.
106136

107137
Bugs fixed in 2020.1
108138

109-
#2015743 (Bug #103150, #103815)
110-
When deleting files using 'Delete from Helix Core' option, the files are now left writable on disk.
139+
#2015743 (Bug #103150, #103815)
140+
When deleting files using 'Delete from Helix Core' option, the files
141+
are now left writable on disk.
111142

112-
#2016245 (Bug #103814)
113-
Handled Helix Core time out nicely; now prompts the user to reconnect by entering password.
143+
#2016245 (Bug #103814)
144+
Handled Helix Core time out nicely; now prompts the user to reconnect
145+
by entering password.
114146

115147
-------------------------------------------
116148
Major new functionality in 2019.1
117-
#1888146 (Bug #100708)
118-
Added support for Helix Authentication Service.
149+
#1888146 (Bug #100708)
150+
Added support for Helix Authentication Service.
119151

120-
#1826274 (Bug #99767)
121-
Upgrade P4SL to use Simulink R2016b APIs.
152+
#1826274 (Bug #99767)
153+
Upgrade P4SL to use Simulink R2016b APIs.
122154

123-
#1889498 (Bug #99769)
124-
Upgraded p4java api version to 2019.1.1889202.
155+
#1889498 (Bug #99769)
156+
Upgraded p4java api version to 2019.1.1889202.
125157

126158
Minor new functionality in 2019.1
127159

128-
#1828879 (Bug #99770)
129-
Supports Unicode enabled Helix Core server.
160+
#1828879 (Bug #99770)
161+
Supports Unicode enabled Helix Core server.
130162

131163
-------------------------------------------
132164
Bugs fixed in 2019.1
133165

134-
#1826838 (Bug #99772)
135-
Fixed exception message being shown when user clicks on New --> Project --> From Perforce.
166+
#1826838 (Bug #99772)
167+
Fixed exception message being shown when user clicks on
168+
New --> Project --> From Perforce.
136169

137170

138171

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apply plugin: 'idea'
1010
apply plugin: 'java-library-distribution'
1111
apply plugin: 'jacoco'
1212

13-
sourceCompatibility = 1.8
13+
sourceCompatibility = 11
1414

1515
project.ext.ver = project.hasProperty('ver') ? project.ext.ver : '0'
1616
version = project.ext.ver
@@ -28,12 +28,12 @@ configurations {
2828
// and configurations.runtimeClasspath respectively
2929
dependencies {
3030
implementation files( 'libs/api.jar', 'libs/util.jar' )
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'
34-
implementation 'commons-io:commons-io:2.11.0'
35-
implementation 'org.apache.commons:commons-exec:1.3'
36-
implementation 'org.apache.commons:commons-compress:1.21'
31+
implementation 'com.perforce:p4java:2024.1.2612262'
32+
implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
33+
implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
34+
implementation 'commons-io:commons-io:2.15.1'
35+
implementation 'org.apache.commons:commons-exec:1.4.0'
36+
implementation 'org.apache.commons:commons-compress:1.26.2'
3737
testImplementation 'junit:junit:4.13.2'
3838
}
3939

0 commit comments

Comments
 (0)