diff --git a/.gitignore b/.gitignore
index ec56431..05c13e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 *.jar
 *.war
 *.ear
+
+# maven
+target/
diff --git a/docs/org.eclipse.jst.ejb.doc.user/pom.xml b/docs/org.eclipse.jst.ejb.doc.user/pom.xml
new file mode 100644
index 0000000..95dab00
--- /dev/null
+++ b/docs/org.eclipse.jst.ejb.doc.user/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.ejb.doc.user</artifactId>
+  <version>1.1.301-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/docs/org.eclipse.jst.ejb.ui.infopop/pom.xml b/docs/org.eclipse.jst.ejb.ui.infopop/pom.xml
new file mode 100644
index 0000000..99c3b27
--- /dev/null
+++ b/docs/org.eclipse.jst.ejb.ui.infopop/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.ejb.ui.infopop</artifactId>
+  <version>1.0.300-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.ejb.ui/pom.xml b/plugins/org.eclipse.jst.ejb.ui/pom.xml
new file mode 100644
index 0000000..aaa9655
--- /dev/null
+++ b/plugins/org.eclipse.jst.ejb.ui/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.ejb.ui</artifactId>
+  <version>1.1.800-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/pom.xml
new file mode 100644
index 0000000..8363cac
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotation.model/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb.annotation.model</artifactId>
+  <version>1.1.300-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/pom.xml
new file mode 100644
index 0000000..f06da30
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb.annotations.emitter</artifactId>
+  <version>1.1.200-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml
new file mode 100644
index 0000000..d1a6379
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb.annotations.ui</artifactId>
+  <version>1.1.200-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/pom.xml
new file mode 100644
index 0000000..f3d5395
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb.annotations.xdoclet</artifactId>
+  <version>1.2.200-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml
new file mode 100644
index 0000000..7ebe06c
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb</artifactId>
+  <version>1.1.700-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/pom.xml b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/pom.xml
new file mode 100644
index 0000000..d6faf43
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.xdoclet.runtime/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.xdoclet.runtime</artifactId>
+  <version>1.1.300-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.jee.ejb/pom.xml b/plugins/org.eclipse.jst.jee.ejb/pom.xml
new file mode 100644
index 0000000..6260491
--- /dev/null
+++ b/plugins/org.eclipse.jst.jee.ejb/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.jee.ejb</artifactId>
+  <version>1.0.400-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..33c55f0
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse</groupId>
+    <artifactId>wtp-parent</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../wtp-parent</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.webtools.ejb</artifactId>
+  <version>3.5.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>docs/org.eclipse.jst.ejb.doc.user</module>
+    <module>docs/org.eclipse.jst.ejb.ui.infopop</module>
+
+    <module>plugins/org.eclipse.jst.ejb.ui</module>
+    <module>plugins/org.eclipse.jst.j2ee.ejb</module>
+    <module>plugins/org.eclipse.jst.j2ee.ejb.annotation.model</module>
+    <module>plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter</module>
+    <module>plugins/org.eclipse.jst.j2ee.ejb.annotations.ui</module>
+    <module>plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet</module>
+    <module>plugins/org.eclipse.jst.j2ee.xdoclet.runtime</module>
+    <module>plugins/org.eclipse.jst.jee.ejb</module>
+
+    <module>tests/org.eclipse.jst.ejb.ui.tests</module>
+
+    <!-- per bug 412467 this plugin is not in use and should not be built
+         https://bugs.eclipse.org/412467
+    <module>tests/org.eclipse.jst.j2ee.ejb.generation.tests</module>
+    -->
+  </modules>
+</project>
diff --git a/tests/org.eclipse.jst.ejb.ui.tests/pom.xml b/tests/org.eclipse.jst.ejb.ui.tests/pom.xml
new file mode 100644
index 0000000..a65f0e8
--- /dev/null
+++ b/tests/org.eclipse.jst.ejb.ui.tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.ejb.ui.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
index b54b35e..13ea1cd 100644
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
+++ b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.jst.j2ee.ejb.generation.tests"
    name="Tests Plug-in"
-   version="1.0.0"
+   version="1.0.0.qualifier"
    provider-name="Eclipse.org"
    class="org.eclipse.jst.j2ee.ejb.generation.tests.TestsPlugin">
 
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/pom.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/pom.xml
new file mode 100644
index 0000000..6de4b96
--- /dev/null
+++ b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.ejb</groupId>
+    <artifactId>org.eclipse.webtools.ejb</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.ejb</groupId>
+  <artifactId>org.eclipse.jst.j2ee.ejb.generation.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>