You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by rg...@apache.org on 2022/06/04 00:42:11 UTC
[flume] branch trunk updated (36b5e267 -> 309002eb)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
from 36b5e267 Fix doc mistakes
new 8b6ed2c8 Use Apache parent repository defn. Disable deploying unnecessary modules
new 52026072 Remove local maven config settings
new 309002eb Fix javadoc build issues
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.mvn/local-settings.xml | 48 ------------------------------------------------
.mvn/maven.config | 1 -
build-support/pom.xml | 31 +++++++++++++++++++++++++++++++
flume-ng-dist/pom.xml | 8 ++++++++
pom.xml | 23 +++++++++--------------
5 files changed, 48 insertions(+), 63 deletions(-)
delete mode 100644 .mvn/local-settings.xml
delete mode 100644 .mvn/maven.config
[flume] 01/03: Use Apache parent repository defn. Disable deploying unnecessary modules
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 8b6ed2c80b0d1b62e1e6d54613c2316461344ae4
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Jun 3 08:20:37 2022 -0700
Use Apache parent repository defn. Disable deploying unnecessary modules
---
build-support/pom.xml | 13 +++++++++++++
flume-ng-dist/pom.xml | 8 ++++++++
pom.xml | 11 +++++++++--
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/build-support/pom.xml b/build-support/pom.xml
index df98d97a..11f5c4b1 100644
--- a/build-support/pom.xml
+++ b/build-support/pom.xml
@@ -27,5 +27,18 @@ limitations under the License.
<description>Build tools and Configuration</description>
<properties>
<maven.site.skip>true</maven.site.skip>
+ <deploy.plugin.version>2.8.2</deploy.plugin.version>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${deploy.plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index c17bdf03..5bbfd34e 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -83,6 +83,14 @@
<failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum: don't consider error -->
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${mvn-deploy-plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 3ec484ca..77e27d6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,9 @@ limitations under the License.
<sourceJavaVersion>1.8</sourceJavaVersion>
<targetJavaVersion>1.8</targetJavaVersion>
+ <!-- Signing User for release -->
+ <GPGSigningUserName>rgoers@apache.org</GPGSigningUserName>
+
<!-- defaults for flaky test and focused test exclusions -->
<test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->
<test.include.pattern>**/Test*.java</test.include.pattern>
@@ -98,6 +101,7 @@ limitations under the License.
<mvn-checksum-plugin.version>1.7</mvn-checksum-plugin.version>
<mvn-clean-plugin.version>3.1.0</mvn-clean-plugin.version>
<mvn-compiler-plugin.version>3.8.1</mvn-compiler-plugin.version>
+ <mvn-deploy-plugin.version>2.8.2</mvn-deploy-plugin.version>
<mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version>
<mvn-javadoc-plugin.version>2.9</mvn-javadoc-plugin.version>
<mvn-paranamer-plugin.version>2.8</mvn-paranamer-plugin.version>
@@ -189,6 +193,9 @@ limitations under the License.
<goals>
<goal>sign</goal>
</goals>
+ <configuration>
+ <keyname>${GPGSigningUserName}</keyname>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -431,11 +438,11 @@ limitations under the License.
</organization>
<distributionManagement>
- <repository>
+ <!--<repository>
<id>apache.staging.https</id>
<name>Apache Staging Repository</name>
<url>https://repository.apache.org/service/local/staging/deploy/maven2/</url>
- </repository>
+ </repository>-->
<site>
<id>apache.website</id>
<url>${siteUrlDeployment}</url>
[flume] 02/03: Remove local maven config settings
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 520260720db7fe9f797a17ce20a94219a26d275a
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Jun 3 12:38:20 2022 -0700
Remove local maven config settings
---
.mvn/local-settings.xml | 48 ------------------------------------------------
.mvn/maven.config | 1 -
pom.xml | 14 --------------
3 files changed, 63 deletions(-)
diff --git a/.mvn/local-settings.xml b/.mvn/local-settings.xml
deleted file mode 100644
index 55d11d30..00000000
--- a/.mvn/local-settings.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd">
- <mirrors>
- <mirror>
- <id>wso2-unblocked</id>
- <mirrorOf>wso2</mirrorOf>
- <name>wso2-unblocked</name>
- <url>http://dist.wso2.org/maven2/</url>
- </mirror>
- <mirror>
- <id>maven-twttr-unblocked</id>
- <mirrorOf>maven-twttr</mirrorOf>
- <name>maven-twttr-unblocked</name>
- <url>http://maven.twttr.com</url>
- </mirror>
- <mirror>
- <id>maven-restlet-unblocked</id>
- <mirrorOf>maven-restlet</mirrorOf>
- <name>maven-restlet-unblocked</name>
- <url>http://maven.restlet.org</url>
- </mirror>
- <mirror>
- <id>datanucleus-unblocked</id>
- <mirrorOf>datanucleus</mirrorOf>
- <name>datanucleus-unblocked</name>
- <url>http://www.datanucleus.org/downloads/maven2</url>
- </mirror>
- <mirror>
- <id>glassfish-repository-unblocked</id>
- <mirrorOf>glassfish-repository</mirrorOf>
- <name>glassfish-repository-unblocked</name>
- <url>http://maven.glassfish.org/content/groups/glassfish</url>
- </mirror>
- <mirror>
- <id>glassfish-repo-archive-unblocked</id>
- <mirrorOf>glassfish-repo-archive</mirrorOf>
- <name>glassfish-repo-archive-unblocked</name>
- <url>http://maven.glassfish.org/content/groups/glassfish</url>
- </mirror>
- <mirror>
- <id>conjars-unblocked</id>
- <mirrorOf>conjars</mirrorOf>
- <name>conjars-unblocked</name>
- <url>http://conjars.org/repo</url>
- </mirror>
- </mirrors>
-</settings>
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
deleted file mode 100644
index 2965a02f..00000000
--- a/.mvn/maven.config
+++ /dev/null
@@ -1 +0,0 @@
---settings ./.mvn/local-settings.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 77e27d6a..dcc4b56c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@ limitations under the License.
<!-- defaults for flaky test and focused test exclusions -->
<test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->
<test.include.pattern>**/Test*.java</test.include.pattern>
- <siteUrlDeployment>file://people.apache.org/www/incubator.apache.org/flume</siteUrlDeployment>
<stagingDirectory>${project.basedir}/target/docs</stagingDirectory>
<activemq.version>5.7.0</activemq.version>
@@ -437,19 +436,6 @@ limitations under the License.
<url>http://www.apache.org</url>
</organization>
- <distributionManagement>
- <!--<repository>
- <id>apache.staging.https</id>
- <name>Apache Staging Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2/</url>
- </repository>-->
- <site>
- <id>apache.website</id>
- <url>${siteUrlDeployment}</url>
- <name>Flume Site</name>
- </site>
- </distributionManagement>
-
<build>
<plugins>
[flume] 03/03: Fix javadoc build issues
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 309002eb94e16fb42d8b3811a96cf93e55b3f585
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Jun 3 16:34:50 2022 -0700
Fix javadoc build issues
---
build-support/pom.xml | 18 ++++++++++++++++++
pom.xml | 2 ++
2 files changed, 20 insertions(+)
diff --git a/build-support/pom.xml b/build-support/pom.xml
index 11f5c4b1..b1479521 100644
--- a/build-support/pom.xml
+++ b/build-support/pom.xml
@@ -28,6 +28,7 @@ limitations under the License.
<properties>
<maven.site.skip>true</maven.site.skip>
<deploy.plugin.version>2.8.2</deploy.plugin.version>
+ <mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version>
</properties>
<build>
<plugins>
@@ -39,6 +40,23 @@ limitations under the License.
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${mvn-gpg-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dcc4b56c..a063ec77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,6 +481,7 @@ limitations under the License.
<excludes>
<exclude>**/*.sha512</exclude>
</excludes>
+ <keyname>${GPGSigningUserName}</keyname>
</configuration>
</plugin>
@@ -611,6 +612,7 @@ limitations under the License.
<!-- include ONLY flume multi-module dependencies -->
<dependencySourceInclude>org.apache.flume:*</dependencySourceInclude>
</dependencySourceIncludes>
+ <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>