diff --git a/jpa/employee/employee.model/pom.xml b/jpa/employee/employee.model/pom.xml
index a34728a..4ded44d 100644
--- a/jpa/employee/employee.model/pom.xml
+++ b/jpa/employee/employee.model/pom.xml
@@ -58,8 +58,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 
diff --git a/moxy/twitter/.classpath b/moxy/twitter/.classpath
index 9fc2de7..750b6b3 100644
--- a/moxy/twitter/.classpath
+++ b/moxy/twitter/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -22,7 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/moxy/twitter/.settings/org.eclipse.core.resources.prefs b/moxy/twitter/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..29abf99
--- /dev/null
+++ b/moxy/twitter/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/moxy/twitter/.settings/org.eclipse.jdt.core.prefs b/moxy/twitter/.settings/org.eclipse.jdt.core.prefs
index abec6ca..ec4300d 100644
--- a/moxy/twitter/.settings/org.eclipse.jdt.core.prefs
+++ b/moxy/twitter/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/moxy/twitter/pom.xml b/moxy/twitter/pom.xml
index b6cf405..e77a2ab 100644
--- a/moxy/twitter/pom.xml
+++ b/moxy/twitter/pom.xml
@@ -108,7 +108,7 @@
 				<version>1.2.1</version>
 				<executions>
 					<execution>
-                        <phase>install</phase>
+						<phase>install</phase>
 						<goals>
 							<goal>java</goal>
 						</goals>
@@ -118,27 +118,27 @@
 					<classpathScope>test</classpathScope>
 					<mainClass>eclipselink.example.moxy.twitter.Main</mainClass>
 					<systemProperties>
-                        <systemProperty>
-                            <key>java.net.useSystemProxies</key>
-                            <value>true</value>
-                        </systemProperty>
-                        <!-- 
 						<systemProperty>
-							<key>proxySet</key>
+							<key>java.net.useSystemProxies</key>
 							<value>true</value>
 						</systemProperty>
-						<systemProperty>
-							<key>proxyHost</key>
-							<value>www.proxy.com</value>
-						</systemProperty>
-						<systemProperty>
-							<key>proxyPort</key>
-							<value>80</value>
-						</systemProperty>
-                        -->
+						<!-- <systemProperty> <key>proxySet</key> <value>true</value> </systemProperty> 
+							<systemProperty> <key>proxyHost</key> <value>www.proxy.com</value> </systemProperty> 
+							<systemProperty> <key>proxyPort</key> <value>80</value> </systemProperty> -->
 					</systemProperties>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>