You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/01/22 12:03:16 UTC
(commons-pool) branch POOL_2_X updated (a11fa24a -> f820d7da)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
from a11fa24a Merge branch 'POOL_2_X' of https://github.com/apache/commons-pool.git into POOL_2_X
new 17c46caa Fix Maven src assembly to include all of the src folder
new f820d7da Use the current XML Schema https://maven.apache.org/xsd/assembly-2.2.0.xsd
The 2 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:
pom.xml | 3 +-
src/assembly/bin.xml | 59 +++++++++++++++++-----------------
src/assembly/src-tar-gz.xml | 77 ---------------------------------------------
src/assembly/src-zip.xml | 76 --------------------------------------------
src/assembly/src.xml | 46 +++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 185 deletions(-)
delete mode 100644 src/assembly/src-tar-gz.xml
delete mode 100644 src/assembly/src-zip.xml
create mode 100644 src/assembly/src.xml
(commons-pool) 02/02: Use the current XML Schema https://maven.apache.org/xsd/assembly-2.2.0.xsd
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit f820d7da43753f014a6b6a8c596194d6136d4892
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 22 07:03:10 2025 -0500
Use the current XML Schema
https://maven.apache.org/xsd/assembly-2.2.0.xsd
- End file in EOL
- Indent by 2
---
src/assembly/bin.xml | 59 ++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 0a598cb5..327a4579 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -14,34 +14,33 @@
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 https://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>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>apidocs</outputDirectory>
- </fileSet>
- </fileSets>
+<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 https://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>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
(commons-pool) 01/02: Fix Maven src assembly to include all of the src folder
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit 17c46caab0ea468fbcb78f8708b024f2df32f00d
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 22 07:01:44 2025 -0500
Fix Maven src assembly to include all of the src folder
Use the current XML Schema
https://maven.apache.org/xsd/assembly-2.2.0.xsd
---
pom.xml | 3 +-
src/assembly/src-tar-gz.xml | 77 ---------------------------------------------
src/assembly/src-zip.xml | 76 --------------------------------------------
src/assembly/src.xml | 46 +++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 155 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e34abc5..e1488ba6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,7 @@
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src-tar-gz.xml</descriptor>
- <descriptor>src/assembly/src-zip.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
deleted file mode 100644
index 56591537..00000000
--- a/src/assembly/src-tar-gz.xml
+++ /dev/null
@@ -1,77 +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 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>build.xml</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>pom.xml</include>
- <include>README.md</include>
- <include>RELEASE-NOTES.txt</include>
- <include>SECURITY.md</include>
- </includes>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>doc</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/conf</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/site/resources</directory>
- </fileSet>
- <fileSet>
- <directory>src/site/xdoc</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/site</directory>
- <includes>
- <include>site.xml</include>
- </includes>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/changes</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/test/java</directory>
- <lineEnding>lf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</assembly>
-
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
deleted file mode 100644
index 5a597131..00000000
--- a/src/assembly/src-zip.xml
+++ /dev/null
@@ -1,76 +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 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>src</id>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>build.xml</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>pom.xml</include>
- <include>README.md</include>
- <include>RELEASE-NOTES.txt</include>
- <include>SECURITY.md</include>
- </includes>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>doc</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/conf</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/site/resources</directory>
- </fileSet>
- <fileSet>
- <directory>src/site/xdoc</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/site</directory>
- <includes>
- <include>site.xml</include>
- </includes>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/changes</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/main</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/test/java</directory>
- <lineEnding>crlf</lineEnding>
- </fileSet>
- <fileSet>
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 00000000..25bc90cc
--- /dev/null
+++ b/src/assembly/src.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>CODE_OF_CONDUCT.md</include>
+ <include>CONTRIBUTING.md</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>pom.xml</include>
+ <include>README.md</include>
+ <include>RELEASE-NOTES.txt</include>
+ <include>SECURITY.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>