Skip to content

Commit

Permalink
Upgrade to LDAP library that works with Java 11+. And other dependency
Browse files Browse the repository at this point in the history 
upgrades.
  • Loading branch information
@davewichers
davewichers committed Apr 9, 2024
1 parent c71c07f commit 89644a2
Show file tree
Hide file tree
Showing 4 changed files with 410 additions and 335 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/maven.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Java CI with Maven

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'zulu'
- name: Run Spotless check
run: mvn spotless:check
- name: Create WAR
run: mvn package

172 changes: 96 additions & 76 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</plugin>
</plugins>
</configuration>
Expand Down Expand Up @@ -624,7 +624,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
<version>1.16.1</version>
</dependency>

<!-- mvn dependency:analyze says this is an unused declared dependency, but its wrong. Get this runtime error if it's not included: Caused by: org.springframework.beans.factory.CannotLoadBeanClassException: Cannot find class [org.apache.commons.dbcp.BasicDataSource] for bean with name 'dataSource' defined in class path resource [context.xml]; nested exception is java.lang.ClassNotFoundException: org.apache.commons.dbcp.BasicDataSource -->
Expand All @@ -634,37 +634,54 @@
<version>1.4</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>io.github.pixee</groupId>
<artifactId>java-security-toolkit</artifactId>
<version>1.1.3</version>
</dependency>

<!-- Including slf4j lib to avoid warning: SLF4J: Defaulting to no-operation (NOP) logger implementation -->
<!-- Have to include early in the pom like this so this version takes precendence over the old version used by the apacheds libs. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>2.0.9</version>
<version>2.0.12</version>
</dependency>

<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-model</artifactId>
<version>${version.apache.api-ldap}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-schema-data</artifactId>
<version>${version.apache.api-ldap}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
<!-- Upgrading to 2.0.0-M24 is an API breaking change. But it might be needed for Java 10, because I get this error, that I don't get with Java 8: [java] at org.apache.directory.server.core.DefaultDirectoryService.initialize(DefaultDirectoryService.java:1426) [java] at org.apache.directory.server.core.DefaultDirectoryService.startup(DefaultDirectoryService.java:907) [java] at org.owasp.benchmark.helpers.LDAPServer.initDirectoryService(LDAPServer.java:148) [java] at org.owasp.benchmark.helpers.LDAPServer.<init>(LDAPServer.java:42) [java] at org.owasp.benchmark.helpers.LDAPServer.main(LDAPServer.java:320) [java] Caused by: java.lang.NumberFormatException: multiple points [java] at java.base/jdk.internal.math.FloatingDecimal.readJavaFormatString(FloatingDecimal.java:1914) -->
<version>${version.apacheds}</version>
<exclusions>
<!-- Excluded because its old, and there is a bug in it causing an exception when using it. -->
<exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
<!-- Excluded because it conflicts with esapi's dependency, which is newer -->
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-annotations</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
Expand All @@ -673,12 +690,30 @@
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-avl</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-jndi</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-interceptor-kerberos</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
Expand All @@ -687,7 +722,7 @@

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
<artifactId>apacheds-kerberos-codec</artifactId>
<version>${version.apacheds}</version>
</dependency>

Expand All @@ -711,45 +746,32 @@

<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-base</artifactId>
<artifactId>apacheds-server-annotations</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
<version>${version.apache-shared-ldap}</version>
<exclusions>
<!-- Excluded because it conflicts with esapi's dependency, which is newer -->
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema</artifactId>
<version>${version.apache-shared-ldap}</version>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema-loader</artifactId>
<version>${version.apache-shared-ldap}</version>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-test-framework</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema-manager</artifactId>
<version>${version.apache-shared-ldap}</version>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-partition</artifactId>
<version>${version.apacheds}</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.3</version>
<version>5.3.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -835,11 +857,8 @@
<!-- version 2.0.2 of this library is actually 1.0.b2, per the message: [WARNING] The artifact xml-apis:xml-apis:jar:2.0.2 has been relocated to xml-apis:xml-apis:jar:1.0.b2 -->
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>io.github.pixee</groupId>
<artifactId>java-security-toolkit</artifactId>
</dependency>
</dependencies>

</dependencies>

<build>
<finalName>benchmark</finalName>
Expand Down Expand Up @@ -868,7 +887,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -907,11 +926,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<fork>true</fork>
<meminitial>1000m</meminitial>
<maxmem>2000m</maxmem>
<release>${java.target}</release>
</configuration>
</plugin>

Expand All @@ -929,7 +949,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
</dependencies>
<executions>
Expand All @@ -941,7 +961,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${project.java.target}</maxJdkVersion>
<maxJdkVersion>${java.target}</maxJdkVersion>
<message>Dependencies shouldn't require Java 9+.</message>
</enforceBytecodeVersion>
</rules>
Expand All @@ -956,8 +976,8 @@
<configuration>
<rules>
<requireJavaVersion>
<version>${project.java.target}</version>
<message>Benchmark is currently written to support Java 8+.</message>
<version>${java.target}</version>
<message>Benchmark is currently written to support Java 8.</message>
</requireJavaVersion>
</rules>
</configuration>
Expand All @@ -981,7 +1001,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -1020,7 +1040,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
<version>3.2.5</version>
</plugin>

<plugin>
Expand All @@ -1035,7 +1055,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<version>1.10.11</version>
<version>1.10.12</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -1068,7 +1088,7 @@
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
<!-- You MUST update the plugin version used in findsecbugs profile, so these versions match. You can't define/use a versions.findsecbugs property because it breaks the naming of the findsecbugs results file. -->
<version>1.12.0</version>
<version>1.13.0</version>
</plugin>

<plugin>
Expand All @@ -1090,7 +1110,7 @@
<version>2.30.0</version>
<configuration>
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
<ratchetFrom>origin/master</ratchetFrom>
<ratchetFrom>origin/main</ratchetFrom>
<formats>
<!-- you can define as many formats as you want, each is independent -->
<format>
Expand Down Expand Up @@ -1158,6 +1178,16 @@
</java>
</configuration>

<executions>
<execution>
<id>spotless-apply</id>
<phase>compile</phase>
<goals>
<goal>apply</goal>
</goals>
</execution>
</executions>

</plugin>

</plugins>
Expand Down Expand Up @@ -1199,8 +1229,8 @@

<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
<java.target>8</java.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.java.target>1.8</project.java.target>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.war.webxml>${basedir}/src/config/web.xml</maven.war.webxml>
<!-- runenv defaults to local here. But scripts can set this to 'remote' to launch remotely accessible Benchmark. e.g., mvn clean package cargo:run -Pdeploy1.2 -Drunenv=remote -->
Expand All @@ -1217,29 +1247,19 @@
</tomcat.jvmargs.debug>
<log.directory>${project.build.directory}/log</log.directory>

<version.apacheds>1.5.7</version.apacheds>
<version.apache-shared-ldap>0.9.19</version.apache-shared-ldap>
<version.exec.maven>1.6.0</version.exec.maven>
<version.apache.api-ldap>2.1.5</version.apache.api-ldap>
<version.apacheds>2.0.0.AM27</version.apacheds>
<version.fluido>2.0.0-M8</version.fluido>
<!-- hibernate is up to rev 6+. But 4.0.0. causes this error: symbol: org.hibernate.classic.Session not found -->
<version.hibernate>3.6.10.Final</version.hibernate>
<version.spotbugs.maven>4.8.2.0</version.spotbugs.maven>
<version.spotbugs>4.8.3</version.spotbugs>
<version.spotbugs.maven>4.8.3.1</version.spotbugs.maven>
<version.spotbugs>4.8.4</version.spotbugs>
<!-- Spring 6.x requires Java 17 -->
<version.springframework>5.3.31</version.springframework>
<version.springframework>5.3.33</version.springframework>
<!-- Tomcat 10 moves from Java EE to Jakarta EE, moving packages javax.* to jakarta.* - code changes likely required to address this change. -->
<tomcat.major.version>9</tomcat.major.version>
<version.tomcat>9.0.84</version.tomcat>
<version.tomcat>9.0.85</version.tomcat>
<tomcat.url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url>
<versions.java-security-toolkit>1.1.3</versions.java-security-toolkit>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.github.pixee</groupId>
<artifactId>java-security-toolkit</artifactId>
<version>${versions.java-security-toolkit}</version>
</dependency>
</dependencies>
</dependencyManagement>
</properties>

</project>
Loading

0 comments on commit 89644a2

Please sign in to comment.