Add conflict w/ XP 6

xp-framework · Nov 6, 2015 · 58e554b · 58e554b
1 parent a14ff63
commit 58e554b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "xp-framework/zip": "self.version"
   },
 
-  "conflicts": {
+  "conflict": {
     "xp-framework/core": ">= 6.0",
     "xp-framework/csv": ">= 6.0",
     "xp-framework/ftp": ">= 6.0",
@@ -44,7 +44,7 @@
     "xp-framework/webservices": ">= 6.0",
     "xp-framework/xml": ">= 6.0",
     "xp-framework/zip": ">= 6.0"
-  }
+  },
 
   "autoload" : {
     "files" : ["src/main/php/__xp.php", "src/main/resources/autoload.php"]

diff --git a/core/ChangeLog.md b/core/ChangeLog.md
@@ -1,8 +1,9 @@
 XP Framework ChangeLog
 ========================================================================
 
-## ?.??.? / ????-??-??
+## 5.11.2 / 2015-11-07
 
+* Updated `composer.json` to "conflict" with XP6 packages (@kiesel)
 
 ## 5.11.1 / 2015-11-07
 

diff --git a/core/src/main/php/VERSION b/core/src/main/php/VERSION
@@ -1 +1 @@
-5.11.2-dev
+5.11.2