2024.1 Code Drop

perforce · Jul 15, 2024 · 97815a5 · 97815a5
1 parent c293f18
commit 97815a5
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 66 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
+Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
 
 
 BY INSTALLING OR DOWNLOADING THE SOFTWARE, YOU ARE ACCEPTING AND AGREEING TO THE TERMS OF
@@ -59,21 +59,17 @@ commons-codec-1.15.jar
     Copyright:   Copyright The Apache Software Foundation
     Reference:   https://commons.apache.org/
 
-commons-compress-1.21.jar
+commons-compress-1.26.0.jar
   Licenses:
     License:     Apache 2.0
-    Reference:   https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.21/commons-compress-1.21.pom
+    Reference:   https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.pom
     LicenseText: License Text Under Appendix
 
   Copyrights:
-    Copyright:   Copyright 2002-2021 The Apache Software Foundation
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/7dcd678d-1798-4c01-9ce3-67fe6811a901
+    Copyright:   Copyright 2002-2024 The Apache Software Foundation
+    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/ccebaff8-5316-4db3-9d3a-51e2951925c8
     Author:      The Apache Software Foundation
 
-    Copyright:   Copyright 1996-2019 Julian R Seward
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/7dcd678d-1798-4c01-9ce3-67fe6811a901
-    Author:      Julian R Seward
-
 commons-exec-1.3.jar
   Licenses:
     License:     Apache 2.0
@@ -85,26 +81,26 @@ commons-exec-1.3.jar
     Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/1998c91e-7b23-43bb-845c-ea0d33b3920c
     Author:      The Apache Software Foundation
 
-commons-io-2.11.0.jar
+commons-io-2.15.1.jar
   Licenses:
     License:     Apache 2.0
-    Reference:   https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
+    Reference:   https://repo.maven.apache.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.pom
     LicenseText: License Text Under Appendix
 
   Copyrights:
-    Copyright:   Copyright 2002-2021 The Apache Software Foundation
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/454db108-23ea-4a10-ab65-9a699dc34ab2
+    Copyright:   Copyright 2002-2023 The Apache Software Foundation
+    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/c37716e5-bcbe-452d-996a-1d9553fbc907
     Author:      The Apache Software Foundation
 
-commons-lang3-3.12.0.jar
+commons-lang3-3.14.0.jar
   Licenses:
     License:     Apache 2.0
-    Reference:   https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.pom
+    Reference:   https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.pom
     LicenseText: License Text Under Appendix
 
   Copyrights:
-    Copyright:   Copyright 2001-2021 The Apache Software Foundation
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/11239b3a-f2b6-4016-bd0c-c0ce1d0fa09e
+    Copyright:   Copyright 2001-2023 The Apache Software Foundation
+    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/25f33986-d48b-41f1-9e9e-74fbf5897a98
     Author:      The Apache Software Foundation
 
 jsr305-3.0.2.jar
@@ -161,17 +157,12 @@ log4j-core-2.19.0.jar
     Copyright:   Copyright 2022 The Apache Software Foundation
     Reference:   https://logging.apache.org/log4j/2.x/
 
-p4java-2022.2.2444480.jar
+p4java-2024.1.2612262.jar
   Licenses:
     License:     BSD 3
-    Reference:   https://repo.maven.apache.org/maven2/com/perforce/p4java/2022.2.2444480/p4java-2022.2.2444480.pom
+    Reference:   https://repo.maven.apache.org/maven2/com/perforce/p4java/2024.1.2612262/p4java-2024.1.2612262.pom
     LicenseText: License Text Under Appendix
 
-  Copyrights:
-    Copyright:   Copyright 2023 Perforce Software, Inc
-    Reference:   https://www.perforce.com/perforce/doc.current/user/p4java_eula.txt
-    Author:      Perforce Software, Inc
-
 
   Appendix:
 -----

diff --git a/RELNOTES.txt b/RELNOTES.txt
@@ -1,7 +1,7 @@
                             Release Notes for
           P4SL, the Helix Core (Perforce) Plugin for Simulink and Matlab
 
-                            Version 2022.2
+                            Version 2024.1
 
 Introduction
 
@@ -22,7 +22,7 @@ Requirements
 
 	* Perforce server at Release 2017.1 or higher.
 
-	* Java: full standard JDK 8 or later.  Implementation as
+	* Java: full standard JDK 11 or later.  Implementation as
 	  discussed in "Known Limitations" below.
 
 	* SSL: unlimited strength JCE (Java Cryptography Extension) package for
@@ -63,76 +63,109 @@ Known Limitations
 	  <java-home>/lib/security/US_export_policy.jar
 
 -------------------------------------------
-Major new functionality in 2022.2 (2022.2/2447215) (2023/05/30)
+Major new functionality in 2024.1 (2024.1/2620571) (2024/07/02)
 
-    #2445997  (Job #114818, #115704)
-    	Updated P4Java version to P4Java 2022.2.2444480
+    #2616732  (Job #121144 #121368)
+	Updated P4Java version to P4Java 2024.1.2612262
+	Updated Java version to 11.
+
+    #2617759  (Job #121369)
+	Upgraded P4SL to use Simulink R2024a APIs.
+
+    #2616732  (Job #121424 #121142)
+	Upgraded org.apache.commons:commons-compress:1.26.2 to
+	address CVEs: CVE-2024-25710 and CVE-2024-26308 
 
-    	Upgraded P4SL to use Simulink R2023a APIs.
+
+-------------------------------------------
+Major new functionality in 2023.2 (2023.2/2561373) (2024/02/23)
+
+	#2552541  (Job #119065)
+		Updated P4Java version to P4Java 2023.2.2553500
+
+-------------------------------------------
+Major new functionality in 2023.1  (2023.1/2518458) (2023/11/13)
+
+	#2513039  (Job #116936, #116996)
+		Updated P4Java version to P4Java 2023.1.2512805
+
+		Upgraded P4SL to use Simulink R2023b APIs.
+
+-------------------------------------------
+Major new functionality in 2022.2 (2022.2/2447215) (2023/05/30)
+
+	#2445997  (Job #114818, #115704)
+		Updated P4Java version to P4Java 2022.2.2444480
+
+		Upgraded P4SL to use Simulink R2023a APIs.
 
 -------------------------------------------
 Major new functionality in 2022.1 Patch 1 (2022.1/2393090) (2023/01/17)
 
-    #2391906  (Job #113987)
-    	Updated P4Java version to P4Java 2022.1.2390907
+	#2391906  (Job #113987)
+		Updated P4Java version to P4Java 2022.1.2390907
 
 -------------------------------------------
 Major new functionality in 2022.1 (2022.1/2355860) (2022/10/13)
 
-    #2354278  (Job #112759)
-        Use the versions of api.jar and util.jar corresponding to Matlab R2022b
+	#2354278  (Job #112759)
+		 Use the versions of api.jar and util.jar corresponding to
+		 Matlab R2022b
 
-    #2354234  (Job #112726)
-    	Updated P4Java version to P4Java 2022.1.2350821
-
+	 #2354234  (Job #112726)
+		Updated P4Java version to P4Java 2022.1.2350821
 
 -------------------------------------------
 Major new functionality in 2021.2
 
-    #2265417  (Bug #110045)
-        Use the versions of api.jar and util.jar corresponding to Matlab R2022a
+	#2265417  (Bug #110045)
+		 Use the versions of api.jar and util.jar corresponding to
+		 Matlab R2022a
 
-    #2266783  (Bug #109732)
-    	Update to the latest P4Java 2021.2
+	#2266783  (Bug #109732)
+		Update to the latest P4Java 2021.2
 
 -------------------------------------------
 Major new functionality in 2020.1
 
-    #2007646 (Bug #103153)
-        Upgraded P4SL to use Simulink R2020a APIs.
+	#2007646 (Bug #103153)
+		Upgraded P4SL to use Simulink R2020a APIs.
 
-    #2007498 (Bug #103133)
-    	Upgraded p4java api version to 2020.1.1999383.
+	#2007498 (Bug #103133)
+		Upgraded p4java api version to 2020.1.1999383.
 
 Bugs fixed in 2020.1
 
-    #2015743 (Bug #103150, #103815)
-    	When deleting files using 'Delete from Helix Core' option, the files are now left writable on disk.
+	#2015743 (Bug #103150, #103815)
+		When deleting files using 'Delete from Helix Core' option, the files
+		are now left writable on disk.
 
-    #2016245 (Bug #103814)
-    	Handled Helix Core time out nicely; now prompts the user to reconnect by entering password.
+	#2016245 (Bug #103814)
+		Handled Helix Core time out nicely; now prompts the user to reconnect
+		by entering password.
 
 -------------------------------------------
 Major new functionality in 2019.1
-    #1888146 (Bug #100708)
-        Added support for Helix Authentication Service.
+	#1888146 (Bug #100708)
+		Added support for Helix Authentication Service.
 
-    #1826274 (Bug #99767)
-        Upgrade P4SL to use Simulink R2016b APIs.
+	#1826274 (Bug #99767)
+		Upgrade P4SL to use Simulink R2016b APIs.
 
-    #1889498 (Bug #99769)
-    	Upgraded p4java api version to 2019.1.1889202.
+	#1889498 (Bug #99769)
+		Upgraded p4java api version to 2019.1.1889202.
 
 Minor new functionality in 2019.1
 
-    #1828879 (Bug #99770)
-	Supports Unicode enabled Helix Core server.
+	#1828879 (Bug #99770)
+		Supports Unicode enabled Helix Core server.
 
 -------------------------------------------
 Bugs fixed in 2019.1
 
-    #1826838 (Bug #99772)
-	Fixed exception message being shown when user clicks on New --> Project --> From Perforce.
+	#1826838 (Bug #99772)
+		Fixed exception message being shown when user clicks on
+		New --> Project --> From Perforce.
 
 
 
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'idea'
 apply plugin: 'java-library-distribution'
 apply plugin: 'jacoco'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 project.ext.ver = project.hasProperty('ver') ? project.ext.ver : '0' 
 version = project.ext.ver
@@ -28,12 +28,12 @@ configurations {
 // and configurations.runtimeClasspath respectively
 dependencies {
 	implementation files( 'libs/api.jar', 'libs/util.jar' )
-	implementation 'com.perforce:p4java:2022.2.2444480'
-	implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
-	implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    implementation 'commons-io:commons-io:2.11.0'
-    implementation 'org.apache.commons:commons-exec:1.3'
-    implementation 'org.apache.commons:commons-compress:1.21'
+	implementation 'com.perforce:p4java:2024.1.2612262'
+	implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
+	implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
+    implementation 'commons-io:commons-io:2.15.1'
+    implementation 'org.apache.commons:commons-exec:1.4.0'
+    implementation 'org.apache.commons:commons-compress:1.26.2'
     testImplementation 'junit:junit:4.13.2'
 }