You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2013/07/26 17:08:04 UTC
svn commit: r1507345 - in /httpcomponents/httpcore/trunk:
httpcore-ab/pom.xml httpcore-nio/pom.xml httpcore/pom.xml pom.xml
Author: sebb
Date: Fri Jul 26 15:08:03 2013
New Revision: 1507345
URL: http://svn.apache.org/r1507345
Log:
Fix up poms now that we are using parent 7 and maven.compiler.* properties
Remove unnecessary java version overrides
Modified:
httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
httpcomponents/httpcore/trunk/httpcore/pom.xml
httpcomponents/httpcore/trunk/pom.xml
Modified: httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/pom.xml?rev=1507345&r1=1507344&r2=1507345&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/pom.xml Fri Jul 26 15:08:03 2013
@@ -40,14 +40,6 @@
<url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <properties>
- <!-- default compiler and surefire plugin settings for "java" profiles -->
- <httpcore.compiler.fork>false</httpcore.compiler.fork>
- <httpcore.compiler.compilerVersion />
- <httpcore.compiler.javac />
- <httpcore.surefire.java />
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -68,19 +60,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecation>${maven.compile.deprecation}</showDeprecation>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/pom.xml?rev=1507345&r1=1507344&r2=1507345&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/pom.xml Fri Jul 26 15:08:03 2013
@@ -41,14 +41,6 @@
<url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <properties>
- <!-- default compiler and surefire plugin settings for "java" profiles -->
- <httpcore.compiler.fork>false</httpcore.compiler.fork>
- <httpcore.compiler.compilerVersion />
- <httpcore.compiler.javac />
- <httpcore.surefire.java />
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -85,16 +77,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecation>${maven.compile.deprecation}</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
@@ -109,7 +91,7 @@
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
- <source>${maven.compile.source}</source>
+ <source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
Modified: httpcomponents/httpcore/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/pom.xml?rev=1507345&r1=1507344&r2=1507345&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore/pom.xml Fri Jul 26 15:08:03 2013
@@ -41,14 +41,6 @@
<url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <properties>
- <!-- default compiler and surefire plugin settings for "java" profiles -->
- <httpcore.compiler.fork>false</httpcore.compiler.fork>
- <httpcore.compiler.compilerVersion />
- <httpcore.compiler.javac />
- <httpcore.surefire.java />
- </properties>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -77,27 +69,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecation>${maven.compile.deprecation}</showDeprecation>
- <fork>${httpcore.compiler.fork}</fork>
- <compilerVersion>${httpcore.compiler.compilerVersion}</compilerVersion>
- <executable>${httpcore.compiler.javac}</executable>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${httpcore.surefire.java}</jvm>
- </configuration>
- </plugin>
- </plugins>
</build>
<reporting>
@@ -109,7 +80,7 @@
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
- <source>${maven.compile.source}</source>
+ <source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
</links>
Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1507345&r1=1507344&r2=1507345&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Fri Jul 26 15:08:03 2013
@@ -72,7 +72,8 @@
</modules>
<properties>
- <maven.compile.deprecation>false</maven.compile.deprecation>
+ <!-- Override parent 7 setting for deprecation (only - other settings stand)-->
+ <maven.compiler.showDeprecation>false</maven.compiler.showDeprecation>
<junit.version>4.9</junit.version>
<mockito.version>1.8.5</mockito.version>
<commons-logging.version>1.1.3</commons-logging.version>
@@ -146,7 +147,7 @@
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
- <source>${maven.compile.source}</source>
+ <source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
</links>