This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git
The following commit(s) were added to refs/heads/master by this push:
new eccff43 Fix xml escape in changes.xml (thanks to jpainter). Update
assembly schema to v2.2.0 and cleanup ldap pom.xml (unused)
eccff43 is described below
commit eccff4322651f6a5680d89a0585fba283aecb3ef
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Oct 23 13:23:11 2023 +0200
Fix xml escape in changes.xml (thanks to jpainter). Update assembly schema
to v2.2.0 and cleanup ldap pom.xml (unused)
---
dist/src/assembly/bin.xml | 6 +++---
dist/src/assembly/src.xml | 6 +++---
ldap/pom.xml | 3 +--
src/changes/changes.xml | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dist/src/assembly/bin.xml b/dist/src/assembly/bin.xml
index 7b56847..379e251 100644
--- a/dist/src/assembly/bin.xml
+++ b/dist/src/assembly/bin.xml
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
+<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>
diff --git a/dist/src/assembly/src.xml b/dist/src/assembly/src.xml
index 58f15db..8e566a4 100644
--- a/dist/src/assembly/src.xml
+++ b/dist/src/assembly/src.xml
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
+<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>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 2af523f..706b34a 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -23,7 +23,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-ldap</artifactId>
<name>Fulcrum Security LDAP Impl</name>
@@ -45,7 +44,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>always</forkMode>
+ <!-- reuseForks>false</reuseForks-->
<includes>
<include>**/*Test.*</include>
<include>**/*TestCase.*</include>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a30f81c..2c925a0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,7 +25,7 @@
<body>
<release version="3.0.0" description="In GIT">
<action type="add" dev="gk">
- Add UserManager UserSet<T> retrieveUserList(Object criteria) , impl
and tests
+ Add UserManager UserSet<T> retrieveUserList(Object criteria) ,
impl and tests
</action>
<action type="update" dev="gk">
Java Dependency updates: Update to commons-dbcp2 2.10.0 (Torque)
