diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 9783acd76..37aed4905 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -161,7 +161,16 @@
 			 </configuration>			  
 		   </execution>			
 	    </executions>
-	  </plugin>	  	
+	  </plugin>	  	
+	  
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>	  
 	     
       <plugin>
         <groupId>com.mysema.maven</groupId>
diff --git a/querydsl-jpa/src/main/assembly.xml b/querydsl-jpa/src/main/assembly.xml
new file mode 100644
index 000000000..29b3cd1e8
--- /dev/null
+++ b/querydsl-jpa/src/main/assembly.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>full-deps</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <files>
+    <file>
+      <source>../querydsl-root/LICENSE.txt</source>
+      <outputDirectory>/</outputDirectory>
+    </file>	
+  </files>
+  <fileSets>
+    <fileSet>
+      <directory>target</directory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+	  <excludes>
+	    <exclude>*-sources.jar</exclude>	
+	  </excludes>	
+	  <outputDirectory>/lib</outputDirectory>
+    </fileSet>
+  </fileSets>	  
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
index 8e2210ad0..b6b37e34f 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
@@ -8,6 +8,8 @@ package com.mysema.query.jpa.hibernate.sql;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.StatelessSession;
@@ -49,8 +51,10 @@ public final class HibernateSQLQuery extends AbstractSQLQuery<HibernateSQLQuery>
 
     private String cacheRegion;
 
+    @Nullable
     private Map<Object,String> constants;
 
+    @Nullable
     private List<Path<?>> entityPaths;
 
     private int fetchSize = 0;
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
index 18ac37448..e293f4cc9 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
@@ -8,6 +8,7 @@ package com.mysema.query.jpa.sql;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
@@ -43,6 +44,7 @@ public final class JPASQLQuery extends AbstractSQLQuery<JPASQLQuery> implements
 
     private static final Logger logger = LoggerFactory.getLogger(JPASQLQuery.class);
 
+    @Nullable
     private Map<Object,String> constants;
 
 //    private List<Path<?>> entityPaths;