hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1494154 - /httpcomponents/project/trunk/pom.xml
Date Tue, 18 Jun 2013 14:24:08 GMT
Author: sebb
Date: Tue Jun 18 14:24:08 2013
New Revision: 1494154

URL: http://svn.apache.org/r1494154
Log:
Fix compiler plugin variable names; drop compiler config as now redundant

Modified:
    httpcomponents/project/trunk/pom.xml

Modified: httpcomponents/project/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/project/trunk/pom.xml?rev=1494154&r1=1494153&r2=1494154&view=diff
==============================================================================
--- httpcomponents/project/trunk/pom.xml (original)
+++ httpcomponents/project/trunk/pom.xml Tue Jun 18 14:24:08 2013
@@ -46,6 +46,14 @@
 Version 7 - changes since version 6
 ===================================
 
+Fixed maven.compile.* properties => maven.compiler.*
+Dropped configuration of compiler plugin as it automatically picks up the properties
+(now that they are spelt correctly!)
+
+Also maven.compile.deprecation => maven.compiler.showDeprecation
+
+** N.B. Child POMs may need to be adjusted when upgrading to parent pom 7 **
+
 Added Maven pre-requisite of 3.0.3 (minimum)
 Dropped maven-3 profile as no longer needed
 Added Apache parent POM 13; dropped distributionManagement/repository and snapshotRepository
@@ -361,13 +369,6 @@ Felix bundle plugin updated: 2.3.5 -> 2.
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${maven.compile.source}</source>
-          <target>${maven.compile.target}</target>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -381,8 +382,8 @@ Felix bundle plugin updated: 2.3.5 -> 2.
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
               <!-- from buildnumber plugin and properties -->
               <Implementation-Build>${implementation.build}</Implementation-Build>
-              <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+              <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+              <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
             </manifestEntries>
           </archive>
         </configuration>
@@ -773,10 +774,10 @@ Felix bundle plugin updated: 2.3.5 -> 2.
  </prerequisites>
 
  <properties>
-   <maven.compile.source>1.5</maven.compile.source>
-   <maven.compile.target>1.5</maven.compile.target>
-   <maven.compile.optimize>true</maven.compile.optimize>
-   <maven.compile.deprecation>true</maven.compile.deprecation>
+   <maven.compiler.source>1.5</maven.compiler.source>
+   <maven.compiler.target>1.5</maven.compiler.target>
+   <maven.compiler.optimize>true</maven.compiler.optimize>
+   <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    <hc.site.url>scp://people.apache.org/www/hc.apache.org/</hc.site.url>



Mime
View raw message