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 378d636 Cleanup dependency versions, minimal adaptions for deactivted
modules hibernate and ldap, update fulcrum testcontainer to 2.0.0 and fulcrum
yaadi to 2.0.0
378d636 is described below
commit 378d6367eab70113a2d29fa534841a1e05d338d9
Author: Georg Kallidis <[email protected]>
AuthorDate: Wed Oct 11 15:53:04 2023 +0200
Cleanup dependency versions, minimal adaptions for deactivted modules
hibernate and ldap, update fulcrum testcontainer to 2.0.0 and fulcrum yaadi to
2.0.0
---
api/pom.xml | 12 +++++++---
dist/pom.xml | 2 +-
hibernate/pom.xml | 15 ++++++------
.../hibernate/HibernateUserManagerImpl.java | 6 +++++
ldap/pom.xml | 23 ++++++++++--------
.../fulcrum/security/ldap/LDAPUserManagerImpl.java | 6 +++++
memory/pom.xml | 12 ++++++++--
pom.xml | 27 +++++++++++++++-------
torque/pom.xml | 6 ++---
9 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 7e80ded..7e29b12 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.11</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -69,6 +67,14 @@
<artifactId>fulcrum-yaafi</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
diff --git a/dist/pom.xml b/dist/pom.xml
index 5279e1f..58706b1 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
index a206b55..62bff34 100644
--- a/hibernate/pom.xml
+++ b/hibernate/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -84,17 +84,17 @@
<artifactId>cglib</artifactId>
<version>2.2.2</version>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <groupId>org.hsqldb</groupId>
+ <version>2.7.0</version>
<scope>test</scope>
</dependency>
<!-- testing dependencies -->
@@ -119,12 +119,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${turbine.log4j2.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.20.0</version>
+ <version>${turbine.log4j2.version}</version>
</dependency>
</dependencies>
diff --git
a/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
b/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
index c59be43..5bed540 100644
---
a/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
+++
b/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
@@ -230,4 +230,10 @@ public class HibernateUserManagerImpl extends
AbstractUserManager
return user;
}
+
+ @Override
+ public <T extends User> UserSet<T> retrieveUserList(Object arg0) throws
DataBackendException
+ {
+ throw new DataBackendException("Not implemented yet");
+ }
}
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 0acdbdd..2af523f 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -19,14 +19,13 @@
<parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<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>
- <version>1.1.1-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-ldap</url>
@@ -65,37 +64,41 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.turbine</groupId>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
- <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
b/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
index 8139a7e..bcb7f87 100644
--- a/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
+++ b/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
@@ -501,6 +501,12 @@ public class LDAPUserManagerImpl extends
AbstractUserManager
"The LDAP server specified is unavailable", ex);
}
}
+
+ @Override
+ public <T extends User> UserSet<T> retrieveUserList(Object arg0) throws
DataBackendException
+ {
+ throw new DataBackendException("Not implemented yet");
+ }
/**
* Avalon Service lifecycle method
diff --git a/memory/pom.xml b/memory/pom.xml
index 25b1030..ca243b5 100644
--- a/memory/pom.xml
+++ b/memory/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -64,11 +64,11 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -93,5 +93,13 @@
<artifactId>fulcrum-yaafi</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 02b0403..6298572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>12-SNAPSHOT</version>
+ <version>12</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -99,12 +99,12 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -112,19 +112,19 @@
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<!-- junit 5 seems to have problems to find unit tests in test
scoped jar org.apache.fulcrum:fulcrum-security-api:test-jar, upgrade from
1.0.8, classpath loading issue? -->
- <version>1.0.9</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -133,12 +133,23 @@
<version>${turbine.log4j2.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -199,7 +210,7 @@
<!--module>hibernate</module-->
<module>memory</module>
<!-- module>nt</module -->
- <!-- module>ldap</module -->
+ <!--module>ldap</module-->
<module>torque</module>
<module>dist</module>
</modules>
diff --git a/torque/pom.xml b/torque/pom.xml
index d6b2beb..5a71a57 100644
--- a/torque/pom.xml
+++ b/torque/pom.xml
@@ -10,10 +10,10 @@
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
+ <parent>
<artifactId>fulcrum-security</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -81,6 +81,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.torque</groupId>
@@ -121,7 +122,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${turbine.log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
