You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/05/02 15:28:16 UTC

[3/3] git commit: ISIS-770: use non-proxying API of wicket-guice / wicket-ioc

ISIS-770: use non-proxying API of wicket-guice / wicket-ioc

... and ensure that all injected components are intrinsically serializable.

In addition, have moved cglib-nodep and asm to be localized to bytecode-cglib and wrapper, these being the only remaining components that have a dependency on these libraries.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/72a19118
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/72a19118
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/72a19118

Branch: refs/heads/master
Commit: 72a191183ff694f8eebea2c7e3bac3e963e51f9c
Parents: 0e82db1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 2 14:03:28 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 2 14:22:21 2014 +0100

----------------------------------------------------------------------
 component/viewer/restfulobjects/tck/pom.xml      |  5 -----
 .../wicket/viewer/IsisWicketApplication.java     |  2 +-
 .../viewer/IsisWicketUnsecuredApplication.java   |  2 +-
 .../imagecache/ImageResourceCacheClassPath.java  |  8 ++++++--
 .../registries/pages/PageClassListDefault.java   |  2 ++
 .../pages/PageClassRegistryDefault.java          |  2 ++
 .../settings/WicketViewerSettingsDefault.java    |  2 ++
 .../wicket/model/isis/WicketViewerSettings.java  |  4 +++-
 .../wicket/model/models/ImageResourceCache.java  |  4 +++-
 component/viewer/wicket/pom.xml                  |  7 ++++++-
 .../viewer/wicket/ui/pages/PageClassList.java    |  4 +++-
 .../wicket/ui/pages/PageClassRegistry.java       |  4 +++-
 .../viewer/wicket/ui/panels/FormAbstract.java    |  6 +-----
 .../viewer/wicket/ui/panels/PanelAbstract.java   | 19 +++----------------
 core/bytecode-cglib/pom.xml                      | 15 +++++++++++++++
 core/pom.xml                                     | 16 ----------------
 core/wrapper/pom.xml                             | 15 +++++++++++++++
 17 files changed, 66 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 57f8456..6b628fe 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -131,10 +131,5 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-        </dependency>
-
 	</dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index b010bb4..014e06f 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -512,7 +512,7 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
     }
 
     protected void initWicketComponentInjection(final Injector injector) {
-        getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector));
+        getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
index ab27327..7e193b0 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
@@ -176,7 +176,7 @@ public class IsisWicketUnsecuredApplication extends WebApplication implements Co
     }
 
     protected void initWicketComponentInjection(final Injector injector) {
-        getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector));
+        getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index 3bfcc66..1990075 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -34,6 +34,7 @@ import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 
@@ -47,10 +48,12 @@ import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 @Singleton
 public class ImageResourceCacheClassPath implements ImageResourceCache {
 
+    private static final long serialVersionUID = 1L;
+    
     private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg");
     private static final String FALLBACK_IMAGE = "Default.png";
     
-    private final Map<ObjectSpecification, ResourceReference> resourceReferenceBySpec = Maps.newHashMap();
+    private final Map<ObjectSpecId, ResourceReference> resourceReferenceBySpec = Maps.newHashMap();
     private PackageResourceReference fallbackResourceReference;
 
 
@@ -75,7 +78,8 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
         
         resourceReference = lookupResourceReferenceFor(spec);
         
-        resourceReferenceBySpec.put(spec, resourceReference);
+        final ObjectSpecId specId = spec.getSpecId();
+        resourceReferenceBySpec.put(specId, resourceReference);
         return resourceReference;
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index fd54221..4a51c84 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -42,6 +42,8 @@ import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
 @Singleton
 public class PageClassListDefault implements PageClassList {
 
+    private static final long serialVersionUID = 1L;
+
     @Override
     public void registerPages(final PageClassRegistrySpi pageRegistry) {
         pageRegistry.registerPage(PageType.SIGN_IN, getSignInPageClass());

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index 8437e56..56550c7 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -39,6 +39,8 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
 @Singleton
 public class PageClassRegistryDefault implements PageClassRegistry, PageClassRegistrySpi {
 
+    private static final long serialVersionUID = 1L;
+
     private final Map<PageType, Class<? extends Page>> pagesByType = Maps.newHashMap();
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index 34bd920..4f2f0a9 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -29,6 +29,8 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldWithDatePick
 @Singleton
 public class WicketViewerSettingsDefault implements WicketViewerSettings {
 
+    private static final long serialVersionUID = 1L;
+
     IsisConfiguration getConfiguration() {
         return IsisContext.getConfiguration();
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
index 1e2419e..a3b9491 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
@@ -19,8 +19,10 @@
 
 package org.apache.isis.viewer.wicket.model.isis;
 
+import java.io.Serializable;
 
-public interface WicketViewerSettings {
+
+public interface WicketViewerSettings extends Serializable {
 
     public int getMaxTitleLengthInStandaloneTables();
 

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
index 898a0fd..b0828df 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.model.models;
 
+import java.io.Serializable;
+
 import org.apache.wicket.request.resource.ResourceReference;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -28,7 +30,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
  * Ideally I'd like to move this to the <tt>org.apache.isis.viewer.wicket.model.isis</tt>
  * package, however to do so would break existing API (gmap3 has a dependency on this, for example).
  */
-public interface ImageResourceCache {
+public interface ImageResourceCache extends Serializable {
 
     ResourceReference resourceReferenceFor(ObjectAdapter adapter);
     

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 8dc4177..d741c91 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -223,10 +223,15 @@
 				<version>${wicket.version}</version>
 				<exclusions>
 					<exclusion>
-		        			<!-- for dependency convergence -->
+		        		<!-- for dependency convergence -->
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-api</artifactId>
 					</exclusion>
+                    <exclusion>
+                        <!-- for Java7 compatibility (we don't use the proxying capability of this component) -->
+                        <groupId>cglib</groupId>
+                        <artifactId>cglib</artifactId>
+                    </exclusion>
 				</exclusions>
 			</dependency>
 

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
index dd489ba..0e0b459 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.pages;
 
+import java.io.Serializable;
+
 import org.apache.isis.viewer.wicket.model.models.PageType;
 
 /**
@@ -31,7 +33,7 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
  * each pages. This interface can be used to selectively replace some or all of
  * these pages.
  */
-public interface PageClassList {
+public interface PageClassList extends Serializable {
 
     void registerPages(PageClassRegistrySpi pageRegistry);
 

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
index cff0b33..7b030e0 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java
@@ -19,6 +19,8 @@
 
 package org.apache.isis.viewer.wicket.ui.pages;
 
+import java.io.Serializable;
+
 import org.apache.wicket.Page;
 
 import org.apache.isis.viewer.wicket.model.models.PageType;
@@ -26,7 +28,7 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
 /**
  * Registry of the {@link Page} class to use for each {@link PageType}.
  */
-public interface PageClassRegistry {
+public interface PageClassRegistry extends Serializable {
 
     /**
      * Used by <tt>WicketObjectsApplication</tt> to lookup pages from the

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 71e4756..0c417e4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -131,13 +131,9 @@ public abstract class FormAbstract<T> extends Form<T> implements IHeaderContribu
     // Convenience
     // ///////////////////////////////////////////////////////////////////
 
-    @Inject
-    private ComponentFactoryRegistry componentFactoryRegistry;
-    
     @Override
     public ComponentFactoryRegistry getComponentFactoryRegistry() {
-        //return ((ComponentFactoryRegistryAccessor) getApplication()).getComponentFactoryRegistry();
-        return componentFactoryRegistry;
+        return ((ComponentFactoryRegistryAccessor) getApplication()).getComponentFactoryRegistry();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index adc0443..4660587 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -43,6 +43,7 @@ import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.util.Components;
 
 /**
@@ -54,15 +55,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
 
     private ComponentType componentType;
 
-    /**
-     * Injected
-     * 
-     * @see #setComponentFactoryRegistry(ComponentFactoryRegistry)
-     */
-    @javax.inject.Inject
-    @Inject
-    private ComponentFactoryRegistry componentFactoryRegistry;
-
     public PanelAbstract(final ComponentType componentType) {
         this(componentType, null);
     }
@@ -99,7 +91,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
      * @return
      */
     protected Component addOrReplace(final ComponentType componentType, final IModel<?> model) {
-        return componentFactoryRegistry.addOrReplaceComponent(this, componentType, model);
+        return getComponentFactoryRegistry().addOrReplaceComponent(this, componentType, model);
     }
 
     /**
@@ -192,12 +184,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
     // /////////////////////////////////////////////////
 
     protected ComponentFactoryRegistry getComponentFactoryRegistry() {
-        return componentFactoryRegistry;
-    }
-
-    @Inject
-    public void setComponentFactoryRegistry(final ComponentFactoryRegistry componentFactoryRegistry) {
-        this.componentFactoryRegistry = componentFactoryRegistry;
+        return ((ComponentFactoryRegistryAccessor) getApplication()).getComponentFactoryRegistry();
     }
 
     

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index a2afb20..69bfba2 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -61,6 +61,21 @@
         </plugins>
     </reporting>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>3.3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.2.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
 	<dependencies>
 		<dependency>
 		    <groupId>org.apache.isis.core</groupId>

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3129f99..03cd826 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1051,7 +1051,6 @@ ${license.additional-notes}
             </dependency>
 
 
-
             <!-- TCK -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
@@ -1138,21 +1137,11 @@ ${license.additional-notes}
 
             <!-- Bytecode libraries -->
             <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>3.3.1</version>
-            </dependency>
-            <dependency>
                 <groupId>org.objenesis</groupId>
                 <artifactId>objenesis</artifactId>
                 <version>1.4</version>
             </dependency>
             <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-nodep</artifactId>
-                <version>2.2.2</version>
-            </dependency>
-            <dependency>
                 <groupId>org.javassist</groupId>
                 <artifactId>javassist</artifactId>
                 <version>3.18.1-GA</version>
@@ -1414,11 +1403,6 @@ ${license.additional-notes}
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.objenesis</groupId>
             <artifactId>objenesis</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/isis/blob/72a19118/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index a079af3..9836543 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -64,6 +64,21 @@
         </plugins>
     </reporting>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>3.3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.2.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 	<dependencies>
         <dependency>
 		    <groupId>org.apache.isis.core</groupId>