2021.2 patch3 code drop

Author: ppiorunski

RELEASE.md

@@ -1,7 +1,7 @@
                             Release Notes for
                        P4Java, the Perforce Java API
 
-                              Version 2021.2 Patch 2
+                              Version 2021.2 Patch 3
 
 Introduction
 
@@ -121,19 +121,28 @@ Known Limitations
 	  <java-home>/lib/security/local_policy.jar
 	  <java-home>/lib/security/US_export_policy.jar
 
+-------------------------------------------
+Updates in 2021.2 Patch 3
+
+    #2277193 (Job #108577)
+        Fixed parallel sync batchsize.
+
+	#2277668 (Job #110201)
+		Parallel sync now passes charset to parallel threads.
+
 -------------------------------------------
 Updates in 2021.2 Patch 2
 
-    #2263992  (Job #109211)
+    #2263992 (Job #109211)
         Fixed how view mappings are parsed in label spec.
 
-    #2268314  (Job #108842)
+    #2268314 (Job #108842)
         Reconcile of unchanged UTF17-LE files, no longer opens them for edit.
 
-    #2268017  (Job #105306)
+    #2268017 (Job #105306)
         Fixed reconcile of paths with mix of slashes.
 
-    #2269716  (Job #110044)
+    #2269716 (Job #110044)
         Login no longer throws exception when connected to a broker.
 
 -------------------------------------------

p4java_eula.txt

@@ -0,0 +1,44 @@
+Copyright (c) 2022, Perforce Software, Inc. All rights reserved.
+
+
+
+BY INSTALLING OR DOWNLOADING THE SOFTWARE, YOU ARE ACCEPTING AND AGREEING TO THE TERMS OF
+THIS END USER LICENSE AGREEMENT (THE "LICENSE AGREEMENT"), AND IT LEGALLY BINDS YOU AND
+YOUR EMPLOYER (COLLECTIVELY THE "LICENSEE"), AND PERFORCE SOFTWARE, INC., A DELAWARE
+CORPORATION ("PERFORCE"), TO THE TERMS AND CONDITIONS OF THE LICENSE AGREEMENT (INCLUDING
+ANY TERMS, CONDITIONS, AND RESTRICTIONS CONTAINED IN ANY ORDER RELATING TO THE SOFTWARE).
+IF THE LICENSEE DOES NOT ACCEPT AND AGREE TO THE TERMS AND CONDITIONS OF THE LICENSE
+AGREEMENT THEN DO NOT DOWNLOAD, INSTALL, OR OTHERWISE USE THE SOFTWARE.
+
+
+
+THE RIGHT TO USE THE SOFTWARE IS CONDITIONAL UPON ACCEPTANCE OF THE LICENSE AGREEMENT,
+UNLESS THE LICENSEE HAS ENTERED INTO A WRITTEN AND DULY SIGNED LICENSE AGREEMENT WITH
+PERFORCE, IN WHICH CASE SUCH SIGNED LICENSE AGREEMENT WILL GOVERN THE LICENSEE'S USE OF
+THE SOFTWARE.
+
+
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+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 USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pom.xml

@@ -28,12 +28,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:perforce:workshop.perforce.com:1666//guest/perforce_software/p4java
-        </connection>
-        <developerConnection>
-            scm:perforce:workshop.perforce.com:1666//guest/perforce_software/p4java
-        </developerConnection>
-        <url>https://swarm.workshop.perforce.com/files/guest/perforce_software/p4java</url>
+        <connection>scm:git:https://github.com/perforce/p4java.git</connection>
+        <developerConnection>scm:git:https://github.com/perforce/p4java.git</developerConnection>
+        <url>https://github.com/perforce/p4java</url>
     </scm>
 
     <developers>

src/main/java/com/perforce/p4java/impl/generic/core/DefaultParallelSync.java

@@ -80,6 +80,7 @@ public void run() {
 					server.setWorkingDirectory(cmdEnv.getServer().getWorkingDirectory());
 					server.setTrustFilePath(cmdEnv.getServer().getTrustFilePath());
 					server.setTicketsFilePath(cmdEnv.getServer().getTicketsFilePath());
+					server.setCharsetName(cmdEnv.getServer().getCharsetName());
 					server.connect();
 
 					//pass the result to the handle result

src/main/java/com/perforce/p4java/impl/mapbased/rpc/func/client/ClientHelper.java

@@ -72,7 +72,7 @@ public static String[] buildParallelOptions(IServer serverImpl, List<IFileSpec>
 			parallelOptionsBuilder.append(",batch=" + pSyncOpts.getBatch());
 		}
 		if (pSyncOpts.getBatchSize() > 0) {
-			parallelOptionsBuilder.append(",batchSize=" + pSyncOpts.getBatchSize());
+			parallelOptionsBuilder.append(",batchsize=" + pSyncOpts.getBatchSize());
 		}
 
 		String[] syncOptions = Parameters.processParameters(syncOpts, fileSpecs, serverImpl);