diff --git a/conversations/pom.xml b/conversations/pom.xml
index 78957a741cd..2a4c3fb637d 100644
--- a/conversations/pom.xml
+++ b/conversations/pom.xml
@@ -4,7 +4,7 @@
    
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    
diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
index 670e9d40514..8a21b00b9ff 100644
--- a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
+++ b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
@@ -4,12 +4,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Named;
-import javax.context.Conversation;
-import javax.context.SessionScoped;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 import javax.faces.model.SelectItem;
-import javax.inject.Current;
-import javax.inject.Produces;
 
 import org.jboss.webbeans.conversation.ConversationIdGenerator;
 import org.jboss.webbeans.conversation.ConversationInactivityTimeout;
diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
index 8f2a9888050..e530e459cfc 100644
--- a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
+++ b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
@@ -1,14 +1,14 @@
 package org.jboss.webbeans.examples.conversations;
 
-import javax.context.ConversationScoped;
-import javax.annotation.Named;
+import java.io.Serializable;
+
 import javax.annotation.PreDestroy;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
 
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 
-import java.io.Serializable;
-
 @ConversationScoped
 @Named
 public class Data implements Serializable
diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
index 4035dd110aa..2c2d23e504a 100644
--- a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
+++ b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
index f80437eea54..7edfe427f1e 100644
--- a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
+++ b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
@@ -3,16 +3,16 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 @Named
 @SessionScoped
@@ -29,7 +29,7 @@ public class Game implements Serializable
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game()
    {
diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
index add4c8e05d3..6025bf85982 100644
--- a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
+++ b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator implements Serializable 
diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
index e7913619f4b..e4e147fd61b 100644
--- a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
+++ b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
index e238096a84c..5e81810971c 100644
--- a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
+++ b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
diff --git a/login/pom.xml b/login/pom.xml
index 4905da4578b..1c6f73a3c2e 100644
--- a/login/pom.xml
+++ b/login/pom.xml
@@ -4,7 +4,7 @@
    
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    
diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java b/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
index ad842d67212..ca07ebb642a 100644
--- a/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
+++ b/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
 
 @RequestScoped @Named
 public class Credentials implements Serializable {
diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java b/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
index ec85278ca73..5ac10440b90 100644
--- a/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
+++ b/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
@@ -8,7 +8,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE, METHOD, FIELD})
diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/Login.java b/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
index 06a06371d0e..49d86927cc4 100644
--- a/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
+++ b/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
@@ -4,12 +4,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.inject.Current;
-import javax.inject.Produces;
 
 @SessionScoped @Named
 public class Login implements Serializable {
diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
index f80437eea54..7edfe427f1e 100644
--- a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
+++ b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
@@ -3,16 +3,16 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 @Named
 @SessionScoped
@@ -29,7 +29,7 @@ public class Game implements Serializable
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game()
    {
diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
index add4c8e05d3..6025bf85982 100644
--- a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
+++ b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator implements Serializable 
diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
index e7913619f4b..e4e147fd61b 100644
--- a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
+++ b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
index e238096a84c..5e81810971c 100644
--- a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
+++ b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
index 54adcb189bd..f86e658636e 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 
 import javax.annotation.PostConstruct;
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
 
 /**
  * This class contains the pure logic of the Number Guess game.
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
index 0ac1b9ec348..b0d4e649768 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
index af9565450c9..0e6e0b3e821 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
@@ -16,16 +16,17 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 @Target( {TYPE, METHOD, PARAMETER, FIELD} )
 @Retention( RUNTIME )
 @Documented
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
index de80bdba574..9f796af6f7b 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 /**
  * This class generates on demand appropriate messages depending on the current
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
index ec0ff78a828..6e2548ee899 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
@@ -18,10 +18,10 @@
 
 import java.awt.CardLayout;
 
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Manager;
 
 /**
  * Swing-based number guess example, main application frame.
@@ -38,7 +38,7 @@ public NumberGuessFrame()
     {
     }
 
-    public void start( @Observes @Deployed Manager manager )
+    public void start( @Observes AfterDeploymentValidation event )
     {
         java.awt.EventQueue.invokeLater( new Runnable()
             {
diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
index a2b14e5320e..16a26963cf7 100644
--- a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
+++ b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
@@ -16,16 +16,17 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 @Target( {TYPE, METHOD, PARAMETER, FIELD} )
 @Retention( RUNTIME )
 @Documented
diff --git a/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java b/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
index e117fc72388..1781fccdfbd 100644
--- a/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
+++ b/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 
 import javax.ejb.EJB;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 public class TextTranslator implements Serializable
 { 
diff --git a/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java b/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
index 5915003ebe8..0550f47b56b 100644
--- a/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
+++ b/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.examples.translator;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Stateful
 @RequestScoped
diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF b/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128c0..00000000000
--- a/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml b/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index ad16d940fa9..00000000000
--- a/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
-	<display-name>
-	webbeans-translator-ejb</display-name>
-</ejb-jar>
diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
index c42ee7ce5b9..0e9b17a9730 100644
--- a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
+++ b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 import org.jboss.webbeans.conversation.ConversationInactivityTimeout;
 
diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
index a2f9a8f2bea..9d8ae4d17b4 100644
--- a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
+++ b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
 
 @ConversationScoped
 @Named
diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
index 4035dd110aa..2c2d23e504a 100644
--- a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
+++ b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
index 4bb658b6ffd..e42d7ebb37e 100755
--- a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
+++ b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.context.Conversation;
-import javax.inject.Current;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Current;
 
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.WebPage;
diff --git a/wicket/numberguess/pom.xml b/wicket/numberguess/pom.xml
index a1cc919b476..fb149533327 100755
--- a/wicket/numberguess/pom.xml
+++ b/wicket/numberguess/pom.xml
@@ -49,6 +49,11 @@
 			<!-- TODO Move to version matrix -->
 			<version>1.2.14</version>
 		</dependency>
+		
+		<dependency>
+         <groupId>javax.annotation</groupId>
+         <artifactId>jsr250-api</artifactId>
+    </dependency>
 
 
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
diff --git a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
index cc143fbb8a2..b7c70d6292c 100755
--- a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
+++ b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
@@ -3,12 +3,12 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.NamingException;
 
 @Named
@@ -26,7 +26,7 @@ public class Game implements Serializable
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game() throws NamingException {}
 
diff --git a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
index d988f1445d9..ab07274c89f 100755
--- a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
+++ b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 
 @ApplicationScoped
diff --git a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
index a1bd764265d..149cdf71d84 100755
--- a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
+++ b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
@@ -1,21 +1,16 @@
 package org.jboss.webbeans.examples.wicket;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
 
 public class HomePage extends WebPage {
 
diff --git a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
index d191bf04b03..8254a6b078c 100755
--- a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
+++ b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
diff --git a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
index 43f8a38b1a1..e1997bbf221 100755
--- a/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
+++ b/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
@@ -11,7 +11,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)