Skip to content

Commit

Permalink
Merge pull request #100 from netceteragroup/feature/no-issue-Update-v…
Browse files Browse the repository at this point in the history 
…ersions

Update to spring-boot 3.4.0
  • Loading branch information
@meierval
meierval authored Dec 19, 2024
2 parents 8b48e41 + d8dcc59 commit 6275794
Show file tree
Hide file tree
Showing 8 changed files with 1,342 additions and 8 deletions.
6 changes: 6 additions & 0 deletions girders-autoconfigure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
10 changes: 5 additions & 5 deletions ...src/main/java/com/netcetera/girders/autoconfigure/ldap/LdapTemplateAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.boot.autoconfigure.ldap.LdapConnectionDetails;
import org.springframework.boot.autoconfigure.ldap.LdapProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.core.env.Environment;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.core.support.DirContextAuthenticationStrategy;
Expand All @@ -35,7 +35,7 @@ public class LdapTemplateAutoConfiguration {
private final LdapPoolingProperties ldapPoolingProperties;
private final LdapAutoConfiguration ldapAutoConfiguration;
private final LdapProperties ldapProperties;
private final Environment environment;
private final LdapConnectionDetails ldapConnectionDetails;
private final ObjectProvider<DirContextAuthenticationStrategy> dirContextAuthenticationStrategy;

/**
Expand All @@ -48,13 +48,13 @@ public LdapTemplateAutoConfiguration(
LdapPoolingProperties ldapPoolingProperties,
LdapProperties ldapProperties,
@Autowired LdapAutoConfiguration ldapAutoConfiguration,
@Autowired Environment environment,
@Autowired LdapConnectionDetails ldapConnectionDetails,
@Autowired ObjectProvider<DirContextAuthenticationStrategy> dirContextAuthenticationStrategy) {

this.ldapAutoConfiguration = ldapAutoConfiguration;
this.ldapPoolingProperties = ldapPoolingProperties;
this.ldapProperties = ldapProperties;
this.environment = environment;
this.ldapConnectionDetails = ldapConnectionDetails;
this.dirContextAuthenticationStrategy = dirContextAuthenticationStrategy;
}

Expand Down Expand Up @@ -98,7 +98,7 @@ public PoolingContextSource poolingContextSource() {
poolingContextSource
.setMinEvictableIdleTimeMillis(ldapPoolingProperties.getMinEvictableIdleTimeMillis());
LdapContextSource contextSource =
ldapAutoConfiguration.ldapContextSource(ldapProperties, environment, dirContextAuthenticationStrategy);
ldapAutoConfiguration.ldapContextSource(ldapConnectionDetails, ldapProperties, dirContextAuthenticationStrategy);
contextSource.afterPropertiesSet();
poolingContextSource.setContextSource(contextSource);
poolingContextSource.setDirContextValidator(new DefaultDirContextValidator());
Expand Down
99 changes: 99 additions & 0 deletions girders-demos/pom.xml.versionsBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.netcetera.girders</groupId>
<artifactId>girders-parent</artifactId>
<version>6.4.1-SNAPSHOT</version>
<relativePath>../girders-parent</relativePath>
</parent>

<groupId>com.netcetera.girders.demos</groupId>
<artifactId>girders-demos</artifactId>
<packaging>pom</packaging>
<name>Girders - Demos</name>
<description>Girders Demos</description>

<modules>
<module>girders-demo-adminserver</module>
<module>girders-demo-showcase</module>
<module>girders-demo-test</module>
</modules>

<properties>
<jdk.version>17</jdk.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- version properties -->
<bootstrap.version>4.6.2</bootstrap.version>
<girders.version>6.4.1-SNAPSHOT</girders.version>
<jquery.version>3.6.4</jquery.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
<webjars-locator.version>0.46</webjars-locator.version>

<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<directory-maven-plugin.version>1.0</directory-maven-plugin.version>

<owasp-cvss-limit>11</owasp-cvss-limit>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.netcetera.girders</groupId>
<artifactId>girders-platform-bom</artifactId>
<version>${girders.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
<version>${webjars-locator.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>${jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-cookie</artifactId>
<version>${jquery-cookie.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${bootstrap.version}</version>
</dependency>
<!-- TODO gbachmei 2020-08-17: temporarily managing version of io.github.classgraph:classgraph manually because of
divergence of transitive dependencies in girders-demo-showcase; remove explicit management once dependencies
converge again -->
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>${classgraph.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>${directory-maven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
44 changes: 44 additions & 0 deletions girders-libs/girders-csrf/pom.xml.versionsBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.netcetera.girders</groupId>
<artifactId>girders-libs</artifactId>
<version>6.4.1-SNAPSHOT</version>
</parent>

<artifactId>girders-csrf</artifactId>
<packaging>jar</packaging>
<name>Girders - Libraries - CSRF Support</name>
<description>Provides Cross-Site Request Forgery support.</description>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>10.1.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

</project>
169 changes: 169 additions & 0 deletions girders-parent/pom.xml.versionsBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.netcetera.girders</groupId>
<artifactId>girders-platform-bom</artifactId>
<version>6.4.1-SNAPSHOT</version>
<relativePath>../girders-platform-bom</relativePath>
</parent>

<artifactId>girders-parent</artifactId>
<packaging>pom</packaging>
<name>Girders - Parent</name>
<description>Girders Parent</description>

<properties>
<java.source.version>17</java.source.version>
<java.target.version>17</java.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugin versions -->
<checkstyle.version>10.12.1</checkstyle.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<owasp-cvss-limit>7.0</owasp-cvss-limit>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>classesAndMethods</parallel>
<useUnlimitedThreads>true</useUnlimitedThreads>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
<!--suppress MavenModelInspection -->
<configLocation>
${girders.basedir}/src/tools/checkstyle/checkstyle-config-88.xml
</configLocation>
<failOnViolation>true</failOnViolation>
<violationSeverity>info</violationSeverity>
<propertyExpansion>config_loc=src/tools/checkstyle</propertyExpansion>
</configuration>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<configuration>
<format>ALL</format>
<failBuildOnAnyVulnerability>false</failBuildOnAnyVulnerability>
<failBuildOnCVSS>${owasp-cvss-limit}</failBuildOnCVSS>
<failOnError>true</failOnError>
<!--suppress MavenModelInspection -->
<suppressionFile>${girders.basedir}/src/tools/suppressions.xml</suppressionFile>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version>
<configuration>
<commitIdGenerationMode>full</commitIdGenerationMode>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<failFast>false</failFast>
<rules>
<requireJavaVersion>
<version>${jdk.version}</version>
</requireJavaVersion>
<bannedDependencies>
<excludes>

<!-- Girders uses SLF4j as logging API and logback as default log backend -->
<exclude>log4j:log4j:*</exclude>
<exclude>commons-logging:commons-logging:*</exclude>
<exclude>commons-logging:commons-logging-api:*</exclude>
<exclude>logkit</exclude>

<!-- Girders uses JUnit 5 -->
<exclude>junit:junit:*:jar</exclude>
<exclude>org.junit.vintage:junit-vintage-engine:*:*</exclude>

<!-- Girders is based on Spring Framework 5+ -->
<exclude>org.springframework:*:[*,5.*)</exclude>

<!-- Girders is based on Spring Boot 2+ -->
<exclude>org.springframework.boot:*:[*,2.*)</exclude>

<!-- Use the actual annotations API, rather than the Tomcat flavour of it -->
<exclude>org.apache.tomcat:tomcat-annotations-api:*</exclude>

<!-- Other blacklisted dependencies -->
<exclude>avalon-framework</exclude>
<exclude>com.sun.jmx:jmxri</exclude>
<exclude>com.sun.jdmk:jmxtools</exclude>
<exclude>commons-httpclient:commons-httpclient</exclude>
<exclude>org.springframework:spring-dao</exclude>
<exclude>org.springframework:spring-support</exclude>
<exclude>*:jackson-dataformat-xml:*</exclude>
</excludes>
</bannedDependencies>
<dependencyConvergence />
<requireReleaseDeps>
<message>No Snapshot dependencies allowed!</message>
<onlyWhenRelease>true</onlyWhenRelease>
</requireReleaseDeps>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>checkstyle</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
7 changes: 4 additions & 3 deletions girders-platform-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

<properties>
<!-- TODO twimmer 2022-04-04: temporarily managing versions of jboss-logging manually because of
divergence of transitive dependencies in girders-starter-validation; remove explicit management once dependencies
divergence of transitive dependencies in girders-starter-validation; remove explicit management once
dependencies
converge again -->
<jboss-logging-processor.version>2.2.1.Final</jboss-logging-processor.version>
<jboss-logging-annotations.version>2.2.1.Final</jboss-logging-annotations.version>
Expand All @@ -37,11 +38,11 @@
<dbunit.version>2.7.3</dbunit.version>
<fontbox.version>3.0.1</fontbox.version>
<fop.version>2.9</fop.version>
<guava.version>32.1.1-jre</guava.version>
<guava.version>33.4.0-jre</guava.version>
<jasypt-spring-boot.version>3.0.2</jasypt-spring-boot.version>
<pdfbox.version>3.0.1</pdfbox.version>
<poi.version>5.2.3</poi.version>
<spring-boot.version>3.2.3</spring-boot.version>
<spring-boot.version>3.4.0</spring-boot.version>
<spring-boot-admin.version>3.2.0</spring-boot-admin.version>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<spring-web-flow.version>3.0.0</spring-web-flow.version>
Expand Down
Loading

0 comments on commit 6275794

Please sign in to comment.