Merge branch 'master' into 267-initial-tensor-dimensions-arent-always-accurate

Author: khatchad

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

@@ -22,8 +22,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>com.ibm.wala.cast.python.test</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
@@ -62,6 +60,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
     </plugins>
+    <sourceDirectory>test-source</sourceDirectory>
     <testSourceDirectory>test-source</testSourceDirectory>
   </build>
 </project>

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

@@ -22,8 +22,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>com.ibm.wala.cast.python.test</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
@@ -70,6 +68,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
     </plugins>
+    <sourceDirectory>test-source</sourceDirectory>
     <testSourceDirectory>test-source</testSourceDirectory>
   </build>
 </project>

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

@@ -12,14 +12,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>com.ibm.wala.cast.python.jython3.test</artifactId>
       <version>0.40.0-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>com.ibm.wala.cast.python.test</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -63,6 +60,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
     </plugins>
+    <sourceDirectory>source</sourceDirectory>
     <testSourceDirectory>source</testSourceDirectory>
   </build>
 </project>

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

@@ -76,18 +76,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
+    <sourceDirectory>source</sourceDirectory>
     <testSourceDirectory>source</testSourceDirectory>
   </build>
 </project>

pom.xml

@@ -83,7 +83,6 @@
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${junit.4.version}</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.python</groupId>