1
0
mirror of https://github.com/square/okhttp.git synced 2025-11-29 06:23:09 +03:00

Don't use the property bootclasspath; that collides with the javadoc plugin.

This commit is contained in:
Jesse Wilson
2014-05-24 01:28:15 -04:00
parent abdf14c400
commit dbbdcd3a39

View File

@@ -217,7 +217,7 @@
<jdk>1.7</jdk> <jdk>1.7</jdk>
</activation> </activation>
<properties> <properties>
<bootclasspath>${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</bootclasspath> <bootclasspathPrefix>${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${npn.version}.jar</bootclasspathPrefix>
</properties> </properties>
<build> <build>
<pluginManagement> <pluginManagement>
@@ -226,7 +226,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>-Xbootclasspath/p:${bootclasspath}</argLine> <argLine>-Xbootclasspath/p:${bootclasspathPrefix}</argLine>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -246,7 +246,7 @@
<jdk>1.8</jdk> <jdk>1.8</jdk>
</activation> </activation>
<properties> <properties>
<bootclasspath>${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar</bootclasspath> <bootclasspathPrefix>${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar</bootclasspathPrefix>
</properties> </properties>
<build> <build>
<pluginManagement> <pluginManagement>
@@ -255,7 +255,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>-Xbootclasspath/p:${bootclasspath}</argLine> <argLine>-Xbootclasspath/p:${bootclasspathPrefix}</argLine>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>