merge

com.ibm.wala.cast.test/pom.xml

@@ -28,7 +28,6 @@
 	      <goal>exec</goal>
 	    </goals>
 	  </execution>
-<<<<<<< HEAD
 	  <execution>
 	    <id>test-native</id>
 	    <phase>test</phase>
@@ -42,8 +41,6 @@
 	      <goal>exec</goal>
 	    </goals>
 	  </execution>
-=======
->>>>>>> f3a38f50d825bd4e2fa6a5fb230a9664fce831c5
 	</executions>
       </plugin>
       <plugin>
@@ -55,11 +52,7 @@
             <phase>test</phase>
             <configuration>
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
-<<<<<<< HEAD
               <argLine>-Djava.library.path=${project.build.outputDirectory} -ea</argLine>
-=======
-              <argLine>-Djava.library.path=${project.build.outputDirectory}:${basedir}/../com.ibm.wala.cast/target/classes -ea</argLine>
->>>>>>> f3a38f50d825bd4e2fa6a5fb230a9664fce831c5
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
             </configuration>
             <goals>

com.ibm.wala.cast/source/c/Makefile.configuration

@@ -1,9 +1,5 @@
 JAVA_SDK = /Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/
-
 DOMO_AST_BIN = /Users/dolby/git/WALA/com.ibm.wala.cast/target/classes/
-
 JAVAH_CLASS_PATH = :/Users/dolby/git/WALA/com.ibm.wala.cast/target/classes/
-
 TRACE =
-
 JNI_MD_DIR = darwin

com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs

@@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
 org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning