Merge pull request #1104 from wagnert/master

Remove configuration for application specific Doctrine Annotation registries from context.xml
appserver-io · Jul 19, 2018 · 7ab90df · 7ab90df
2 parents 92022a8 + 70783cc
commit 7ab90df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Version 1.1.11
+
+## Bugfixes
+
+* Remove configuration for application specific Doctrine Annotation registries from context.xml
+
+## Features
+
+* None
+
 Version 1.1.10
 
 ## Bugfixes

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

diff --git a/etc/appserver/conf.d/context.xml b/etc/appserver/conf.d/context.xml
@@ -55,26 +55,6 @@
         </classLoader>
     </classLoaders>
 
-    <annotationRegistries>
-        <annotationRegistry
-            type="AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\AnnotationRegistries\FileAnnotationRegistry"
-            file="${webapp.dir}/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php" />
-        <annotationRegistry 
-            type="AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\AnnotationRegistries\NamespaceAnnotationRegistry"
-            namespace="AppserverIo\Psr\EnterpriseBeans\Annotations">
-            <directories>
-                <directory>${webapp.dir}/vendor/appserver-io-psr/epb/src</directory>
-            </directories>
-        </annotationRegistry>
-        <annotationRegistry 
-            type="AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\AnnotationRegistries\NamespaceAnnotationRegistry"
-            namespace="AppserverIo\Psr\Servlet\Annotations">
-            <directories>
-                <directory>${webapp.dir}/vendor/appserver-io-psr/servlet/src</directory>
-            </directories>
-        </annotationRegistry>
-    </annotationRegistries>
-
     <loggers>
         <logger channelName="system" name="SystemLogger" type="\AppserverIo\Logger\Logger">
             <handlers>