Merge pull request #55 from belgattitude/develop

Merge change from upstream 7.1.3

.travis/run_soluble_japha_phpunit_tests.sh

@@ -42,7 +42,7 @@ install_soluble_japha_master() {
     git checkout master
 
     # 4. Run composer install
-    composer install
+    composer --ignore-platform-reqs install
 
     # 5. Restore path
     cd $PROJECT_DIR

CHANGELOG.md

@@ -3,16 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## 7.1.0 (TBD)
+## 7.1.3 (2017-05-18)
 
-This release will include mergers from the original php-java-bridge 7.1.3
-when stabilized.
+This release include merges from the original php-java-bridge 7.1.3. 
+Only changes regarding php->java have been merged (not java->php).
 
 ### Added
 
-
-### Changed
-
+- **Upstream-7.1.3:** `Client->setExitCode()`, `Protocol->setExitCode()` from upstream.
 
 ### Updated
 

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'maven-publish'
 group = "io.soluble.pjb"
 archivesBaseName = 'php-java-bridge'
 //version = "6.2.11"
-version = "7.0.1-SNAPSHOT"
+version = "7.1.3"
 description = "PHPJavaBridge server (soluble fork)"
 
 ext {

doc/upstream/upstream_merge_notes.md

@@ -0,0 +1,63 @@
+# Upstream notes
+
+## CVS
+
+### Checkout release
+
+```shell
+cvs -z3 -d:pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge co -P php-java-bridge
+```
+
+### Export specific branch
+
+```shell
+cvs -z3 -d:pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge export -d pjb7.0.1 -r Release_7-0-1 php-java-bridge
+```
+
+or head
+
+```shell
+cvs -z3 -d:pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge export -d pjb-head -r HEAD php-java-bridge
+```
+
+### List releases 
+
+This command list all branches on the original sourceforge repo
+
+```shell
+cvs -Q -d :pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge rlog -h php-java-bridge | awk -F"[.:]" '/^\t/&&$(NF-1)==0{print $1}' | sort -u
+```
+
+You can optionally list all tags:
+
+```shell
+cvs -Q -d :pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge rlog -h php-java-bridge | awk -F"[.:]" '/^\t/&&$(NF-1)!=0{print $1}' | sort -u
+```
+
+> Prefer using branches instead of tags for the sourceforge release. Not every release was tagged.
+
+### Compare changes
+
+You can compare changes made on releases, first checkout head and run: 
+
+For changed files: 
+
+    ```shell
+    cvs diff -N -c -r Release_7-0-1 -r HEAD > pjb701-head.diff    
+    ``` 
+
+For rdiff summary:
+
+    ```shell
+    cvs rdiff -s -r Release_7-0-1 -r HEAD php-java-bridge > rdiff-701-head-summary.txt
+    ``` 
+
+## Example
+
+### 7.0.1 to HEAD
+
+```shell
+# Save head in directory ./pjb-head
+cvs -z3 -d:pserver:anonymous@php-java-bridge.cvs.sourceforge.net:/cvsroot/php-java-bridge export -d pjb-head -r HEAD php-java-bridge
+
+```