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 2017/06/30 09:55:06 UTC

httpcomponents-parent git commit: Added use-toolchains profile; note earlier change

Repository: httpcomponents-parent
Updated Branches:
  refs/heads/master 74d4de4ec -> bccef6d11


Added use-toolchains profile; note earlier change


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/commit/bccef6d1
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/tree/bccef6d1
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/diff/bccef6d1

Branch: refs/heads/master
Commit: bccef6d11adac154064a5717f22a6380847dff50
Parents: 74d4de4
Author: Sebb <se...@apache.org>
Authored: Fri Jun 30 10:54:56 2017 +0100
Committer: Sebb <se...@apache.org>
Committed: Fri Jun 30 10:54:56 2017 +0100

----------------------------------------------------------------------
 pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/blob/bccef6d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f086adc..70b5d32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,8 @@ maven-surefire-plugin 2.19.1 -> 2.20
 maven-resources-plugin 3.0.1 -> 3.0.2
 maven-bundle-plugin 3.2.0 -> 3.3.0
 jacaoco-maven-plugin 0.7.7.201606060606 -> 0.7.9
+Renamed artifactId to httpcomponents-parent
+Added use-toolchains profile; activated if ~/.m2/toolchains.xml exists
 
 Version 8 - changes since version 7
 ===================================
@@ -878,6 +880,42 @@ Fixed JIRA link
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <!--
+        Use toolchains plugin to select compiler version if the toolchains.xml file exists.
+        To override this behaviour, disable the profile using: -P-use-toolchains
+      -->
+      <id>use-toolchains</id>
+      <activation>
+       <file>
+         <exists>${user.home}/.m2/toolchains.xml</exists>
+       </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-toolchains-plugin</artifactId>
+            <version>1.1</version>
+            <configuration>
+              <toolchains>
+                <jdk>
+                  <version>${maven.compiler.source}</version>
+                </jdk>
+              </toolchains>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>toolchain</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     
   </profiles>