Merge pull request #1129 from wagnert/1.1

Extend error handling with exception support
appserver-io · Jun 22, 2019 · e0b8891 · e0b8891
2 parents ae73a48 + 2bf176d
commit e0b8891
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ matrix:
 before_install:
   - if [[ "$TRAVIS_PHP_VERSION" < "7.0" ]]; then pecl install pthreads-2.0.10; fi
   - if [[ "$TRAVIS_PHP_VERSION" = "7.0" ]] || [[ "$TRAVIS_PHP_VERSION" > "7.0" ]]; then pecl install pthreads-3.1.6; fi
-  - pecl install xdebug-2.5.5
   - phpenv rehash
   - wget https://scrutinizer-ci.com/ocular.phar
   - wget https://getcomposer.org/composer.phar

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# Version 1.1.23
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Extend error handling with exception support
+* Add encryption support for LDAP functionality
+* Update to appserver-io/ldap version 3.0.*
+* Update to appserver-io/description version 33.0.*
+* Update to appserver-io/provisioning version 2.0.*
+* Update to appserver-io-psr/cli version 2.0.*
+* Update to appserver-io-psr/application-server version 2.0.*
+
 # Version 1.1.22
 
 ## Bugfixes

diff --git a/UPGRADE-1.1.23.md b/UPGRADE-1.1.23.md
@@ -0,0 +1,3 @@
+# Upgrade from 1.1.22 to 1.1.23
+
+Updating from 1.1.22 to 1.1.23 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.23.
diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.22
+release.version = 1.1.23
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

diff --git a/composer.json b/composer.json
@@ -18,18 +18,18 @@
         "appserver-io-psr/epb": "7.0.*",
         "appserver-io-psr/pms": "2.0.*",
         "appserver-io-psr/mop": "2.0.*",
-        "appserver-io-psr/cli": "1.0.*",
+        "appserver-io-psr/cli": "2.0.*",
         "appserver-io-psr/auth": "2.0.*",
         "appserver-io-psr/naming": "1.1.*",
         "appserver-io-psr/servlet": "4.1.*",
         "appserver-io-psr/security": "1.4.*",
         "appserver-io-psr/deployment": "2.0.*",
         "appserver-io-psr/application": "1.5.*",
-        "appserver-io-psr/application-server": "1.0.*",
+        "appserver-io-psr/application-server": "2.0.*",
         "appserver-io/rmi": "3.2.*",
         "appserver-io/http": "2.2.*",
         "appserver-io/lang": "3.0.*",
-        "appserver-io/ldap": "2.0.*",
+        "appserver-io/ldap": "3.0.*",
         "appserver-io/logger": "2.0.*",
         "appserver-io/fastcgi" : "2.0.*",
         "appserver-io/storage": "2.0.*",
@@ -39,10 +39,10 @@
         "appserver-io/dnsserver": "2.0.*",
         "appserver-io/single-app": "3.0.*",
         "appserver-io/properties": "2.1.*",
-        "appserver-io/provisioning": "1.0.*",
+        "appserver-io/provisioning": "2.0.*",
         "appserver-io/concurrency": "0.3.*",
         "appserver-io/robo-tasks": "0.2.*",
-        "appserver-io/description": "12.0.*",
+        "appserver-io/description": "13.0.*",
         "appserver-io/authenticator": "1.0.*",
         "appserver-io/configuration": "3.0.*",
         "appserver-io/doppelgaenger": "1.7.*",