You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/05/28 16:02:45 UTC
[1/2] httpcomponents-parent git commit: Removed obsolete
svn-buildernumber, notice and clover plugins and profiles
Repository: httpcomponents-parent
Updated Branches:
refs/heads/master d096c345e -> 74d4de4ec
Removed obsolete svn-buildernumber, notice and clover plugins and profiles
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/commit/a480bc89
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/tree/a480bc89
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/diff/a480bc89
Branch: refs/heads/master
Commit: a480bc89fdd52a5727794c7ac5497919b1fa6a99
Parents: d096c34
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun May 28 15:31:18 2017 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun May 28 15:31:18 2017 +0200
----------------------------------------------------------------------
pom.xml | 114 ++---------------------------------------------------------
1 file changed, 3 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/blob/a480bc89/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9b44632..f086adc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,9 @@
Version 9 - changes since version 8
===================================
+Removed obsolete notice plugin
+Removed obsolete svn-buildnumber plugin and profiles
+Removed obsolete clover plugin and profile
maven-compiler-plugin 3.6.0 -> 3.6.1
maven-surefire-plugin 2.19.1 -> 2.20
maven-resources-plugin 3.0.1 -> 3.0.2
@@ -629,22 +632,6 @@ Fixed JIRA link
<version>3.3.0</version>
</plugin>
<plugin>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>maven-notice-plugin</artifactId>
- <version>0.0.2</version>
- <executions>
- <execution>
- <id>attach-notice-license</id>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <projectTitle>Apache HttpComponents</projectTitle>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
@@ -830,100 +817,6 @@ Fixed JIRA link
</properties>
</profile>
- <!--
- Automatically run the buildnumber plugin unless the buildNumber.skip property is defined as true
- -->
- <profile>
- <id>svn-buildnumber</id>
- <activation>
- <property><name>!buildNumber.skip</name><value>!true</value></property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Use committed revision so it does not change every time svn update is run -->
- <useLastCommittedRevision>true</useLastCommittedRevision>
- <!-- default revision number if unavailable -->
- <revisionOnScmFailure>??????</revisionOnScmFailure>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- optional profile to use javasvn instead of the SVN CLI for the buildNumber plugin -->
- <profile>
- <id>javasvn</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <configuration>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- Optional Clover profile -->
- <profile>
- <id>clover</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${hc.clover2.version}</version>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${hc.clover2.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- </profile>
-
<profile>
<id>nodoclint</id>
<build>
@@ -1002,7 +895,6 @@ Fixed JIRA link
<!-- Define versions of all report plugins, because they should match usage in pluginManagement and modules -->
<hc.clirr.version>2.8</hc.clirr.version>
- <hc.clover2.version>4.0.6</hc.clover2.version>
<hc.javadoc.version>2.10.4</hc.javadoc.version>
<hc.jxr.version>2.5</hc.jxr.version>
<hc.surefire-report.version>2.20</hc.surefire-report.version>
[2/2] httpcomponents-parent git commit: Added git attributes
Posted by ol...@apache.org.
Added git attributes
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/commit/74d4de4e
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/tree/74d4de4e
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/diff/74d4de4e
Branch: refs/heads/master
Commit: 74d4de4ec627e6af1e5fa8004e0d2f670b0d81ef
Parents: a480bc8
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun May 28 18:02:29 2017 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun May 28 18:02:29 2017 +0200
----------------------------------------------------------------------
.gitattributes | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-parent/blob/74d4de4e/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1e21b19
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.java text diff=java
+*.html text diff=html
+*.css text
+*.js text