hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject httpcomponents-client git commit: Move profile to parent pom
Date Fri, 30 Jun 2017 09:57:03 GMT
Repository: httpcomponents-client
Updated Branches:
  refs/heads/sebb-toolchain 61bbf21ab -> ed8ae2a43


Move profile to parent pom


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

Branch: refs/heads/sebb-toolchain
Commit: ed8ae2a436de95dc8e3d5a1306a12e60bae42bda
Parents: 61bbf21
Author: Sebb <sebb@apache.org>
Authored: Fri Jun 30 10:56:37 2017 +0100
Committer: Sebb <sebb@apache.org>
Committed: Fri Jun 30 10:56:37 2017 +0100

----------------------------------------------------------------------
 pom.xml | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ed8ae2a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ae0a61..3de20cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,9 +25,10 @@
    <http://www.apache.org />.
  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>project</artifactId>
+    <artifactId>httpcomponents-parent</artifactId>
     <groupId>org.apache.httpcomponents</groupId>
-    <version>8</version>
+    <!-- Temporary change to test toolchains fix -->
+    <version>9-SNAPSHOT</version>
     <relativePath>../project/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -420,38 +421,4 @@
     </plugins>
   </reporting>
 
-  <!-- temporary location; will be moved to parent pom -->
-  <profiles>
-    <profile>
-     <id>toolchain</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>
 </project>


Mime
View raw message