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 2019/04/06 09:01:45 UTC
[httpcomponents-client] branch master updated: Fixed copying of
examples for project website
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
The following commit(s) were added to refs/heads/master by this push:
new 8fdc2ec Fixed copying of examples for project website
8fdc2ec is described below
commit 8fdc2ec1b8d39459c11da26af678a5797b797129
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Apr 6 10:59:23 2019 +0200
Fixed copying of examples for project website
---
httpclient5-fluent/pom.xml | 24 +++++++++++++-----------
httpclient5/pom.xml | 21 +++++++++++++++++++++
pom.xml | 37 -------------------------------------
3 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index acafbfe..b651bb8 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -81,23 +81,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <phase>verify</phase>
+ <id>copy-resources</id>
+ <phase>pre-site</phase>
<goals>
- <goal>check</goal>
+ <goal>copy-resources</goal>
</goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/examples</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/java/org/apache/hc/client5/http/examples/fluent</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
</execution>
</executions>
- <configuration>
- <excludes>
- <exclude>.externalToolBuilders/**</exclude>
- <exclude>maven-eclipse.xml</exclude>
- <exclude>.checkstyle</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
<resources>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index 7cbb738..e16bcbf 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -136,6 +136,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/examples</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test/java/org/apache/hc/client5/http/examples</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index a213ebe..76777e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,28 +249,6 @@
</links>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/site/examples</outputDirectory>
- <resources>
- <resource>
- <directory>src/examples</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -308,21 +286,6 @@
<goal>checkstyle</goal>
</goals>
</execution>
- <execution>
- <id>validate-examples</id>
- <phase>validate</phase>
- <configuration>
- <configLocation>hc-stylecheck/minimal.xml</configLocation>
- <headerLocation>hc-stylecheck/asl2.header</headerLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <linkXRef>false</linkXRef>
- <sourceDirectory>${basedir}/src/examples</sourceDirectory>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>