This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git
The following commit(s) were added to refs/heads/master by this push:
new acaa068 Prepare for release candidate
acaa068 is described below
commit acaa068b406d2b5da7080b3a7c2c1e7e8d34af55
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Mar 2 13:51:38 2024 -0500
Prepare for release candidate
---
commons-email2-bom/pom.xml | 1 +
commons-email2-distribution/pom.xml | 2 ++
pom.xml | 60 ++++++++++---------------------------
src/assembly/bin.xml | 46 ----------------------------
src/assembly/src.xml | 50 -------------------------------
5 files changed, 19 insertions(+), 140 deletions(-)
diff --git a/commons-email2-bom/pom.xml b/commons-email2-bom/pom.xml
index 07de85d..05d8b1a 100644
--- a/commons-email2-bom/pom.xml
+++ b/commons-email2-bom/pom.xml
@@ -48,6 +48,7 @@
</dependencies>
</dependencyManagement>
<properties>
+ <commons.parent.dir>${basedir}/..</commons.parent.dir>
<project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>
<checkstyle.skip>true</checkstyle.skip>
</properties>
diff --git a/commons-email2-distribution/pom.xml
b/commons-email2-distribution/pom.xml
index c968de4..dd0de93 100644
--- a/commons-email2-distribution/pom.xml
+++ b/commons-email2-distribution/pom.xml
@@ -182,6 +182,7 @@ limitations under the License.
<goal>single</goal>
</goals>
<configuration>
+ <skipAssembly>false</skipAssembly>
<finalName>commons-email2-${project.version}</finalName>
<descriptors>
<descriptor>src/assembly/src.xml</descriptor>
@@ -192,6 +193,7 @@ limitations under the License.
<execution>
<id>binary</id>
<configuration>
+ <skipAssembly>false</skipAssembly>
<finalName>commons-email2-${project.version}</finalName>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
diff --git a/pom.xml b/pom.xml
index cb2dcb7..5692d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,12 +68,12 @@
</dependencyManagement>
<properties>
- <commons.parent.dir>${basedir}</commons.parent.dir>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <commons.parent.dir>${basedir}</commons.parent.dir>
<commons.componentid>email</commons.componentid>
<commons.module.name>org.apache.commons.mail2</commons.module.name>
<commons.jira.id>EMAIL</commons.jira.id>
@@ -83,9 +83,11 @@
<commons.release.desc>(Java 8 or above)</commons.release.desc>
<commons.rc.version>RC1</commons.rc.version>
<commons.bc.version>1.5</commons.bc.version>
+
<commons.releaseNotesLocation>${commons.parent.dir}/RELEASE-NOTES.txt</commons.releaseNotesLocation>
<!-- override the default commons encoding property -->
<commons.encoding>UTF-8</commons.encoding>
<mockito-core.version>5.10.0</mockito-core.version>
+ <!--Skip JApiCmp for 1.x to 2.0. -->
<japicmp.skip>true</japicmp.skip>
<project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
@@ -134,16 +136,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
@@ -157,37 +149,6 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
- <!-- Declaration place matters must be after gpg. -->
- <plugin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-release-plugin</artifactId>
- <configuration>
-
<distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/email</distSvnStagingUrl>
- </configuration>
- <executions>
- <execution>
- <id>detatch-distributions</id>
- <phase>verify</phase>
- <goals>
- <goal>detach-distributions</goal>
- </goals>
- </execution>
- <execution>
- <id>compress-site</id>
- <phase>site</phase>
- <goals>
- <goal>compress-site</goal>
- </goals>
- </execution>
- <execution>
- <id>stage-distributions</id>
- <phase>deploy</phase>
- <goals>
- <goal>stage-distributions</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
@@ -196,6 +157,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <!-- Don't build the archives here. They are constructed in the
distribution project -->
+ <execution>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
deleted file mode 100644
index dea1cb7..0000000
--- a/src/assembly/bin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- 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.
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd";>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <includeSiteDirectory>false</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE-NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>apidocs</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
deleted file mode 100644
index 9c3bbcb..0000000
--- a/src/assembly/src.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- 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.
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd";>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <!--
- ${project.build.finalName} doesn't work correctly here; see
- https://issues.apache.org/jira/browse/MASSEMBLY-189
- -->
- <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>pom.xml</include>
- <include>README.txt</include>
- <include>RELEASE-NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>conf</directory>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.cgi</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
