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 2021/01/17 10:04:01 UTC
[httpcomponents-core] branch 5.0.x updated: No need to copy example
sources as resources when generating site content
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/5.0.x by this push:
new c9c4dc5 No need to copy example sources as resources when generating site content
c9c4dc5 is described below
commit c9c4dc5ebc098c3b27c6a01ef37559aff602efa6
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sun Jan 17 10:49:02 2021 +0100
No need to copy example sources as resources when generating site content
---
httpcore5-h2/pom.xml | 25 -----------------------
httpcore5-reactive/pom.xml | 25 -----------------------
httpcore5/pom.xml | 50 +++++++++-------------------------------------
3 files changed, 9 insertions(+), 91 deletions(-)
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index 8150b47..5fa8cf9 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -78,31 +78,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <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/core5/http2/examples</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<reporting>
<plugins>
<plugin>
diff --git a/httpcore5-reactive/pom.xml b/httpcore5-reactive/pom.xml
index c4d69f2..10ba0f5 100644
--- a/httpcore5-reactive/pom.xml
+++ b/httpcore5-reactive/pom.xml
@@ -65,31 +65,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <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/core5/reactive/examples</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<reporting>
<plugins>
<plugin>
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index 0ce79c3..b992c29 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -70,6 +70,15 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -82,48 +91,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </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/core5/http/examples</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
</build>
<reporting>