diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..19942da
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# maven
+target/
+# eclipse
+.project
+.classpath
+.settings
+# OS
+.DS_Store
diff --git a/pom.xml b/pom.xml
index 08d434f..70ea68e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.vaadin.virkki</groupId>
 	<artifactId>cdi-utils</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.0-SNAPSHOT</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <vaadin.version>7.0.5</vaadin.version>
+        <vaadin-cdi.version>1.0.0.alpha1</vaadin-cdi.version>
 	</properties>
 
 
@@ -14,7 +16,7 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-cdi</artifactId>
-			<version>1.0.0.alpha1</version>
+			<version>${vaadin-cdi.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.enterprise</groupId>
@@ -25,7 +27,7 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-server</artifactId>
-			<version>7.0.0.rc2</version>
+			<version>${vaadin.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -33,6 +35,7 @@
 
 
 	<build>
+        <defaultGoal>clean install</defaultGoal>
 		<resources>
 			<resource>
 				<directory>src/main/java</directory>