Merge branch 'master' of github.com:eclipse/rdf4j into develop

Author: James Leigh

pom.xml

@@ -59,18 +59,6 @@
 	</modules>
 
 	<profiles>
-		<profile>
-			<id>localBuild</id>
-			<activation>
-				<property>
-					<!-- activate if property 'hudsonBuild' is not set -->
-					<name>!hudsonBuild</name>
-				</property>
-			</activation>
-			<properties>
-				<hudson.rdf4j.proxy.opts/>
-			</properties>
-		</profile>
 		<profile>
 			<id>ossrh</id>
 			<distributionManagement>
@@ -148,12 +136,6 @@
 				<javadoc.opts>-Xdoclint:none</javadoc.opts>
 			</properties>
 		</profile>
-		<profile>
-			<id>eclipse-hudson-rdf4j</id>
-			<properties>
-				<hudson.rdf4j.proxy.opts>-Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -Dhttps.proxyHost=proxy.eclipse.org -Dhttps.proxyPort=9898 -Dhttp.nonProxyHosts=*.eclipse.org -Dhttps.nonProxyHosts=*.eclipse.org -Dftp.proxyHost=proxy.eclipse.org -Dftp.proxyPort=9898 -Dftp.nonProxyHosts=*.eclipse.org</hudson.rdf4j.proxy.opts>
-			</properties>
-		</profile>
 	</profiles>
 
 	<properties>
@@ -690,7 +672,7 @@
 					<version>2.19.1</version>
 					<configuration>
 						<encoding>UTF-8</encoding>
-						<argLine>-Xmx1024M ${hudson.rdf4j.proxy.opts}</argLine>
+						<argLine>-Xmx1024M</argLine>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -701,7 +683,7 @@
 						<encoding>UTF-8</encoding>
 						<forkCount>1</forkCount>
 						<reuseForks>false</reuseForks>
-						<argLine>-Xmx1024M ${hudson.rdf4j.proxy.opts}</argLine>
+						<argLine>-Xmx1024M</argLine>
 						<includes>
 							<include>**/*Test.java</include>
 						</includes>