merge

.travis.yml

@@ -12,6 +12,7 @@ install:
 script:
 - xvfb-run mvn clean verify -B -q
 - bash ./dependent-projects-trigger.sh $AUTH_TOKEN
+- bash ./upload-javascript.sh $GH_TOKEN
 - jdk_switcher use oraclejdk7
 - ./build-maven-jars.py "install -Dgpg.skip"
 sudo: false
@@ -20,4 +21,4 @@ cache:
   - "$HOME/.m2"
   - "$TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib"
 env:
-  secure: KcugjQYnBqeZ7XenZD5QY7jhekVPO0QpQyjDUteLytaokhyRK2g6eNvr/pPerN2uWUvsPwO18P9F+oOupge1cpPZf4cEY8RzLIromyUoRWd6JA0SKciUYdN2kSqnC4uZSJGXeGLoroyEEL4Q2sqimpkbIGxgxYtVniWgJULOyR4=
+  secure: GTtE6dQXwex1+nZkA9fCrBl/nrl71nwSNrwH+KXEcTWRyLnxQPmGKeCey0kLX2bpVngGu7fi2CPZbGaOOm+0tm1kHZtNUUciVkt9qeA0cwdUHz7/EhfN6Xkj7wYZwQ4XUHMhxnHo9FtHK6IliArjUv84DNcDMHJbaiGcHPEmHGo=

com.ibm.wala.cast.test/build.properties

@@ -1,4 +1,4 @@
-source.. =  harness-src
+source.. =  harness-src/java
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

pom.xml

@@ -105,7 +105,7 @@
 	  <target>
 	    <artifact>
 	      <groupId>com.ibm.wala.target</groupId>
-	      <artifactId>e44</artifactId>
+	      <artifactId>e47</artifactId>
 	      <version>${project-version}</version>
 	    </artifact>
 	  </target>
@@ -240,9 +240,26 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.14.1</version>
       </plugin>		
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.0.0-M1</version>
+            <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+            <executions>
+                <execution>
+                    <id>aggregate</id>
+                    <goals>
+                        <goal>aggregate</goal>
+                    </goals>
+                    <phase>generate-sources</phase>
+                </execution>
+            </executions>
+        </plugin>
 </plugins>
 </build>
-<pluginRepositories>
+  <pluginRepositories>
   <pluginRepository>
     <id>sonatype-public-repository</id>
     <url>https://oss.sonatype.org/content/groups/public</url>

targets/e44/e44.target

@@ -11,7 +11,7 @@
 <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.osgi" version="0.0.0"/>
 <unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
+<repository location="http://ftp.acc.umu.se/mirror/eclipse.org/releases/luna"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>