Merge remote-tracking branch 'origin/master' into neuralnet

Thomas L. Redman · Thomas L. Redman · commit c49df3bcf3d5 · 2017-09-15T14:57:37.000-05:00
diff --git a/lbjava-mvn-plugin/pom.xml b/lbjava-mvn-plugin/pom.xml
@@ -177,12 +177,4 @@
         </profile>
     </profiles>
 
-    <distributionManagement>
-        <repository>
-            <id>CogcompSoftware</id>
-            <name>CogcompSoftware</name>
-            <url>scp://bilbo.cs.illinois.edu:/mounts/bilbo/disks/0/www/cogcomp/html/m2repo</url>
-        </repository>
-    </distributionManagement>
-
 </project>
diff --git a/lbjava/pom.xml b/lbjava/pom.xml
@@ -64,18 +64,6 @@
         </plugins>
     </reporting>
 
-	<distributionManagement>
-		<repository>
-			<id>CogcompSoftware</id>
-			<name>CogcompSoftware</name>
-			<url>scp://bilbo.cs.illinois.edu:/mounts/bilbo/disks/0/www/cogcomp/html/m2repo</url>
-		</repository>
-        <site>
-            <id>CogcompSoftwareDoc</id>
-            <url>scp://bilbo.cs.illinois.edu:/mounts/bilbo/disks/0/www/cogcomp/html/software/doc/${project.artifactId}</url>
-        </site>
-	</distributionManagement>
-
 	<build>
 		<extensions>
 			<extension>
diff --git a/pom.xml b/pom.xml
@@ -33,11 +33,11 @@
         <repository>
             <id>CogcompSoftware</id>
             <name>CogcompSoftware</name>
-            <url>scp://bilbo.cs.illinois.edu:/mounts/bilbo/disks/0/www/cogcomp/html/m2repo</url>
+            <url>scp://legolas.cs.illinois.edu:/srv/data/cogcomp/html/m2repo</url>
         </repository>
         <site>
             <id>CogcompSoftwareDoc</id>
-            <url>scp://bilbo.cs.illinois.edu:/mounts/bilbo/disks/0/www/cogcomp/html/software/doc/${project.artifactId}</url>
+            <url>scp://legolas.cs.illinois.edu:/srv/data/cogcomp/html/software/doc/</url>
         </site>
     </distributionManagement>
 
