Drop Spring Boot 3 and use Spring Boot 4.1 everywhere The starter was compiled against Spring Boot 3.5 and tested against both 3 and 4. Build and test it only against 4.1, using a single `version.spring-boot` property (now 4.1.2). Remove the `scim-server-spring-boot-4` example, `scim-server-spring-boot` is now the only Spring Boot example. Remove the root hibernate-validator entry, it took precedence over the Spring Boot BOM and paired 8.0.5.Final with jakarta.validation-api 3.1.1. The starter now follows the version managed by Spring Boot. scim-spec-schema, the only other user, declares 8.0.5.Final for its tests, so the EE 10 modules stay on jakarta.validation-api 3.0.2.
diff --git a/pom.xml b/pom.xml index d0facbe..71e22cc 100644 --- a/pom.xml +++ b/pom.xml
@@ -51,9 +51,7 @@ <version.slf4j>2.0.16</version.slf4j> <version.antlr4>4.13.2</version.antlr4> <version.resteasy>7.0.4.Final</version.resteasy> - <!-- build against Spring Boot 3.x, test against 3 and 4 (until 3 is end of life) --> - <version.spring-boot3>3.5.16</version.spring-boot3> - <version.spring-boot4>4.1.0</version.spring-boot4> + <version.spring-boot>4.1.2</version.spring-boot> <version.jersey3>3.1.11</version.jersey3> <version.jersey4>4.0.2</version.jersey4> <!-- default surefire/failsafe arg lines to empty--> @@ -255,11 +253,6 @@ <scope>import</scope> </dependency> <dependency> - <groupId>org.hibernate.validator</groupId> - <artifactId>hibernate-validator</artifactId> - <version>8.0.5.Final</version> - </dependency> - <dependency> <groupId>org.glassfish</groupId> <artifactId>jakarta.el</artifactId> <version>4.0.2</version>
diff --git a/scim-server-examples/pom.xml b/scim-server-examples/pom.xml index a1a233c..cbc02d0 100644 --- a/scim-server-examples/pom.xml +++ b/scim-server-examples/pom.xml
@@ -39,7 +39,6 @@ <module>scim-server-jersey-4</module> <module>scim-server-quarkus</module> <module>scim-server-spring-boot</module> - <module>scim-server-spring-boot-4</module> </modules> <build>
diff --git a/scim-server-examples/scim-server-spring-boot-4/README.md b/scim-server-examples/scim-server-spring-boot-4/README.md deleted file mode 100644 index d8764b6..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/README.md +++ /dev/null
@@ -1,26 +0,0 @@ -Apache Directory SCIMple Spring Boot 4 Example -=============================================== - -> ⚠️ **Demo only — not production-hardened.** This example exists to show how to -> integrate Apache Directory SCIMple. It is **not** published to Maven Central and is -> **not** suitable for production: it stores data (including any `password`) in memory in -> cleartext, and it provides **no authentication, authorization, or transport security** — -> those are the integrator's responsibility. Example code is out of scope of the project -> threat model; see [`THREAT_MODEL.md`](../../THREAT_MODEL.md) (§3, §9, §10). - -This example project demo's how to: - -* Add a custom SCIM Extension -* Manage Users and Groups (in memory) - -Use this as a starter point on how to integrate Apache Directory SCIMple into your own project. - -Run: `mvn spring-boot:run` and then access one of the endpoints: - -```bash -# httpie -http :8080/v2/Users - -# curl -curl localhost:8080/v2/Users -```
diff --git a/scim-server-examples/scim-server-spring-boot-4/pom.xml b/scim-server-examples/scim-server-spring-boot-4/pom.xml deleted file mode 100644 index 787a552..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/pom.xml +++ /dev/null
@@ -1,87 +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. --> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.directory.scimple.examples</groupId> - <artifactId>scim-server-examples</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <artifactId>scim-server-spring-boot4</artifactId> - <name>SCIMple - Server - Examples - Spring Boot 4</name> - - <properties> - <module.name>org.apache.directory.scim.example.springboot4</module.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${version.spring-boot4}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.directory.scimple</groupId> - <artifactId>scim-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.directory.scimple</groupId> - <artifactId>scim-server</artifactId> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>${version.spring-boot4}</version> - </plugin> - </plugins> - </build> - -</project>
diff --git a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/ScimpleSpringBootApplication.java b/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/ScimpleSpringBootApplication.java deleted file mode 100644 index 30fadee..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/ScimpleSpringBootApplication.java +++ /dev/null
@@ -1,45 +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. -*/ - -package org.apache.directory.scim.example.spring; - -import org.apache.directory.scim.server.configuration.ServerConfiguration; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -import static org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.AuthenticationSchema.oauthBearer; - -@SpringBootApplication -public class ScimpleSpringBootApplication { - - public static void main(String[] args) { - SpringApplication.run(ScimpleSpringBootApplication.class, args); - } - - @Bean - ServerConfiguration serverConfiguration() { - return new ServerConfiguration() - .setId("scimple-spring-boot-4-example") - .setDocumentationUri("https://github.com/apache/directory-scimple") - // Informational only, returned by /ServiceProviderConfig. - // This does not enforce authentication. Use oauthBearer() or httpBasic() as appropriate. - .addAuthenticationSchema(oauthBearer()); - } -}
diff --git a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/extensions/LuckyNumberExtension.java b/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/extensions/LuckyNumberExtension.java deleted file mode 100644 index caf111b..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/extensions/LuckyNumberExtension.java +++ /dev/null
@@ -1,91 +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. -*/ - -package org.apache.directory.scim.example.spring.extensions; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; -import org.apache.directory.scim.spec.annotation.ScimAttribute; -import org.apache.directory.scim.spec.annotation.ScimExtensionType; -import org.apache.directory.scim.spec.resources.ScimExtension; -import org.apache.directory.scim.spec.schema.Schema; - -/** - * Allows a User's lucky number to be passed as part of the User's entry via - * the SCIM protocol. - * - * @author Chris Harm <crh5255@psu.edu> - */ -@XmlRootElement( name = "LuckyNumberExtension", namespace = "http://www.psu.edu/schemas/psu-scim" ) -@XmlAccessorType(XmlAccessType.NONE) -@ScimExtensionType(id = LuckyNumberExtension.SCHEMA_URN, description="Lucky Numbers", name="LuckyNumbers", required=true) -public class LuckyNumberExtension implements ScimExtension { - - public static final String SCHEMA_URN = "urn:mem:params:scim:schemas:extension:LuckyNumberExtension"; - - @ScimAttribute(returned=Schema.Attribute.Returned.DEFAULT, required=true) - @XmlElement - private long luckyNumber; - - /** - * Provides the URN associated with this extension which, as defined by the - * SCIM specification is the extension's unique identifier. - * - * @return The extension's URN. - */ - @Override - public String getUrn() { - return SCHEMA_URN; - } - - public long getLuckyNumber() { - return this.luckyNumber; - } - - public LuckyNumberExtension setLuckyNumber(long luckyNumber) { - this.luckyNumber = luckyNumber; - return this; - } - - public boolean equals(final Object o) { - if (o == this) return true; - if (!(o instanceof LuckyNumberExtension other)) return false; - if (!other.canEqual((Object) this)) return false; - if (this.getLuckyNumber() != other.getLuckyNumber()) return false; - return true; - } - - protected boolean canEqual(final Object other) { - return other instanceof LuckyNumberExtension; - } - - public int hashCode() { - final int PRIME = 59; - int result = 1; - final long $luckyNumber = this.getLuckyNumber(); - result = result * PRIME + (int) ($luckyNumber >>> 32 ^ $luckyNumber); - return result; - } - - public String toString() { - return "LuckyNumberExtension(luckyNumber=" + this.getLuckyNumber() + ")"; - } -}
diff --git a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryGroupService.java b/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryGroupService.java deleted file mode 100644 index cfb1536..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryGroupService.java +++ /dev/null
@@ -1,125 +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. -*/ - -package org.apache.directory.scim.example.spring.service; - -import jakarta.annotation.PostConstruct; -import jakarta.ws.rs.core.Response; -import org.apache.directory.scim.core.repository.BaseRepository; -import org.apache.directory.scim.core.repository.PatchHandler; -import org.apache.directory.scim.core.schema.SchemaRegistry; -import org.apache.directory.scim.server.exception.UnableToCreateResourceException; -import org.apache.directory.scim.core.repository.ScimRequestContext; -import org.apache.directory.scim.spec.exception.ResourceException; -import org.apache.directory.scim.spec.exception.ResourceNotFoundException; -import org.apache.directory.scim.spec.filter.Filter; -import org.apache.directory.scim.spec.filter.FilterExpressions; -import org.apache.directory.scim.spec.filter.FilterResponse; -import org.apache.directory.scim.spec.filter.SortExpressions; -import org.apache.directory.scim.spec.schema.Schema; -import org.apache.directory.scim.spec.resources.ScimExtension; -import org.apache.directory.scim.spec.resources.ScimGroup; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -@Service -public class InMemoryGroupService extends BaseRepository<ScimGroup> { - - private final Map<String, ScimGroup> groups = new ConcurrentHashMap<>(); - - private final SchemaRegistry schemaRegistry; - - public InMemoryGroupService(SchemaRegistry schemaRegistry, PatchHandler patchHandler) { - super(ScimGroup.class, patchHandler); - this.schemaRegistry = schemaRegistry; - } - - @PostConstruct - public void init() { - ScimGroup group = new ScimGroup(); - group.setId(UUID.randomUUID().toString()); - group.setDisplayName("example-group"); - group.setExternalId("example-group"); - groups.put(group.getId(), group); - } - - @Override - public ScimGroup create(ScimGroup resource, ScimRequestContext requestContext) throws UnableToCreateResourceException { - String id = UUID.randomUUID().toString(); - - // if the external ID is not set, use the displayName instead - if (!StringUtils.hasText(resource.getExternalId())) { - resource.setExternalId(resource.getDisplayName()); - } - - // check to make sure the group doesn't already exist - boolean existingGroupFound = groups.values().stream() - .anyMatch(group -> resource.getExternalId().equals(group.getExternalId())); - if (existingGroupFound) { - // HTTP leaking into data layer - throw new UnableToCreateResourceException(Response.Status.CONFLICT, "Group '" + resource.getExternalId() + "' already exists."); - } - - resource.setId(id); - groups.put(id, resource); - return resource; - } - - @Override - public ScimGroup update(String id, ScimGroup resource, ScimRequestContext requestContext) throws ResourceException { - if (!groups.containsKey(id)) { - throw new ResourceNotFoundException(id); - } - groups.put(id, resource); - return resource; - } - - @Override - public ScimGroup get(String id, ScimRequestContext requestContext) { - return groups.get(id); - } - - @Override - public void delete(String id) throws ResourceException { - if (groups.remove(id) == null) { - throw new ResourceNotFoundException(id); - } - } - - @Override - public FilterResponse<ScimGroup> find(Filter filter, ScimRequestContext requestContext) { - Schema schema = schemaRegistry.getSchema(ScimGroup.SCHEMA_URI); - return groups.values().stream() - .filter(FilterExpressions.inMemory(filter, schema)) - .sorted(SortExpressions.comparator(requestContext.getSortRequest(), schema)) - .collect(FilterResponse.paginate(requestContext.getPageRequestOrDefault())); - } - - @Override - public List<Class<? extends ScimExtension>> getExtensionList() { - return Collections.emptyList(); - } - -}
diff --git a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryUserService.java b/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryUserService.java deleted file mode 100644 index 4629c59..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/src/main/java/org/apache/directory/scim/example/spring/service/InMemoryUserService.java +++ /dev/null
@@ -1,157 +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. -*/ - -package org.apache.directory.scim.example.spring.service; - -import jakarta.annotation.PostConstruct; -import jakarta.ws.rs.core.Response; -import org.apache.directory.scim.core.repository.BaseRepository; -import org.apache.directory.scim.core.repository.PatchHandler; -import org.apache.directory.scim.core.schema.SchemaRegistry; -import org.apache.directory.scim.example.spring.extensions.LuckyNumberExtension; -import org.apache.directory.scim.server.exception.UnableToCreateResourceException; -import org.apache.directory.scim.core.repository.ScimRequestContext; -import org.apache.directory.scim.spec.exception.ResourceException; -import org.apache.directory.scim.spec.exception.ResourceNotFoundException; -import org.apache.directory.scim.spec.extension.EnterpriseExtension; -import org.apache.directory.scim.spec.filter.Filter; -import org.apache.directory.scim.spec.filter.FilterExpressions; -import org.apache.directory.scim.spec.filter.FilterResponse; -import org.apache.directory.scim.spec.filter.SortExpressions; -import org.apache.directory.scim.spec.schema.Schema; -import org.apache.directory.scim.spec.resources.Email; -import org.apache.directory.scim.spec.resources.Name; -import org.apache.directory.scim.spec.resources.ScimExtension; -import org.apache.directory.scim.spec.resources.ScimUser; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Creates a singleton (effectively) {@code Repository<ScimUser>} with a memory-based - * persistence layer. - * - * @author Chris Harm <crh5255@psu.edu> - */ -@Service -public class InMemoryUserService extends BaseRepository<ScimUser> { - - static final String DEFAULT_USER_ID = UUID.randomUUID().toString(); - static final String DEFAULT_USER_EXTERNAL_ID = "e" + DEFAULT_USER_ID; - static final String DEFAULT_USER_DISPLAY_NAME = "User " + DEFAULT_USER_ID; - static final String DEFAULT_USER_EMAIL_VALUE = "e1@example.com"; - static final String DEFAULT_USER_EMAIL_TYPE = "work"; - static final int DEFAULT_USER_LUCKY_NUMBER = 7; - - private final Map<String, ScimUser> users = new ConcurrentHashMap<>(); - - private final SchemaRegistry schemaRegistry; - - public InMemoryUserService(SchemaRegistry schemaRegistry, PatchHandler patchHandler) { - super(ScimUser.class, patchHandler); - this.schemaRegistry = schemaRegistry; - } - - @PostConstruct - public void init() { - ScimUser user = new ScimUser(); - user.setId(DEFAULT_USER_ID); - user.setExternalId(DEFAULT_USER_EXTERNAL_ID); - user.setUserName(DEFAULT_USER_EXTERNAL_ID); - user.setDisplayName(DEFAULT_USER_DISPLAY_NAME); - user.setName(new Name() - .setGivenName("Tester") - .setFamilyName("McTest")); - Email email = new Email(); - email.setDisplay(DEFAULT_USER_EMAIL_VALUE); - email.setValue(DEFAULT_USER_EMAIL_VALUE); - email.setType(DEFAULT_USER_EMAIL_TYPE); - email.setPrimary(true); - user.setEmails(List.of(email)); - - LuckyNumberExtension luckyNumberExtension = new LuckyNumberExtension(); - luckyNumberExtension.setLuckyNumber(DEFAULT_USER_LUCKY_NUMBER); - - user.addExtension(luckyNumberExtension); - - EnterpriseExtension enterpriseExtension = new EnterpriseExtension(); - enterpriseExtension.setEmployeeNumber("12345"); - EnterpriseExtension.Manager manager = new EnterpriseExtension.Manager(); - manager.setValue("bulkId:qwerty"); - enterpriseExtension.setManager(manager); - user.addExtension(enterpriseExtension); - - users.put(user.getId(), user); - } - - @Override - public ScimUser create(ScimUser resource, ScimRequestContext requestContext) throws UnableToCreateResourceException { - String id = UUID.randomUUID().toString(); - - // check to make sure the user doesn't already exist - boolean existingUserFound = users.values().stream() - .anyMatch(user -> user.getUserName().equals(resource.getUserName())); - if (existingUserFound) { - // HTTP leaking into data layer - throw new UnableToCreateResourceException(Response.Status.CONFLICT, "User '" + resource.getUserName() + "' already exists."); - } - - resource.setId(id); - users.put(id, resource); - return resource; - } - - @Override - public ScimUser update(String id, ScimUser resource, ScimRequestContext requestContext) throws ResourceException { - if (!users.containsKey(id)) { - throw new ResourceNotFoundException(id); - } - users.put(id, resource); - return resource; - } - - @Override - public ScimUser get(String id, ScimRequestContext requestContext) { - return users.get(id); - } - - @Override - public void delete(String id) throws ResourceException { - if (users.remove(id) == null) { - throw new ResourceNotFoundException(id); - } - } - - @Override - public FilterResponse<ScimUser> find(Filter filter, ScimRequestContext requestContext) { - Schema schema = schemaRegistry.getSchema(ScimUser.SCHEMA_URI); - return users.values().stream() - .filter(FilterExpressions.inMemory(filter, schema)) - .sorted(SortExpressions.comparator(requestContext.getSortRequest(), schema)) - .collect(FilterResponse.paginate(requestContext.getPageRequestOrDefault())); - } - - @Override - public List<Class<? extends ScimExtension>> getExtensionList() { - return List.of(LuckyNumberExtension.class, EnterpriseExtension.class); - } -}
diff --git a/scim-server-examples/scim-server-spring-boot-4/src/main/resources/application.properties b/scim-server-examples/scim-server-spring-boot-4/src/main/resources/application.properties deleted file mode 100644 index 0183be9..0000000 --- a/scim-server-examples/scim-server-spring-boot-4/src/main/resources/application.properties +++ /dev/null
@@ -1,19 +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. -# -server.servlet.context-path = /v2
diff --git a/scim-server-examples/scim-server-spring-boot/pom.xml b/scim-server-examples/scim-server-spring-boot/pom.xml index 2899dce..9e4516b 100644 --- a/scim-server-examples/scim-server-spring-boot/pom.xml +++ b/scim-server-examples/scim-server-spring-boot/pom.xml
@@ -24,7 +24,7 @@ </parent> <artifactId>scim-server-spring-boot</artifactId> - <name>SCIMple - Server - Examples - Spring Boot 3</name> + <name>SCIMple - Server - Examples - Spring Boot</name> <properties> <module.name>org.apache.directory.scim.example.springboot</module.name> @@ -35,7 +35,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${version.spring-boot3}</version> + <version>${version.spring-boot}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -79,7 +79,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${version.spring-boot3}</version> + <version>${version.spring-boot}</version> </plugin> </plugins> </build>
diff --git a/scim-spec/scim-spec-schema/pom.xml b/scim-spec/scim-spec-schema/pom.xml index 8332e46..34f8559 100644 --- a/scim-spec/scim-spec-schema/pom.xml +++ b/scim-spec/scim-spec-schema/pom.xml
@@ -51,6 +51,7 @@ <dependency> <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> + <version>8.0.5.Final</version> <scope>test</scope> </dependency> <dependency>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml index 930f738..8c4cb52 100644 --- a/support/spring-boot/pom.xml +++ b/support/spring-boot/pom.xml
@@ -38,7 +38,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${version.spring-boot3}</version> + <version>${version.spring-boot}</version> <type>pom</type> <scope>import</scope> </dependency>
diff --git a/support/spring-boot/src/main/java/org/apache/directory/scim/spring/ScimpleSpringConfiguration.java b/support/spring-boot/src/main/java/org/apache/directory/scim/spring/ScimpleSpringConfiguration.java index 4927bc5..1464e09 100644 --- a/support/spring-boot/src/main/java/org/apache/directory/scim/spring/ScimpleSpringConfiguration.java +++ b/support/spring-boot/src/main/java/org/apache/directory/scim/spring/ScimpleSpringConfiguration.java
@@ -53,9 +53,7 @@ * Autoconfigures default beans needed for Apache SCIMple. */ @Configuration -@AutoConfigureBefore(name = { - "org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration", // Spring Boot 4 - "org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration"}) // Spring Boot 3 +@AutoConfigureBefore(name = "org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration") public class ScimpleSpringConfiguration { @Bean