Skip to content

Increasing spring boot version #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitalik12345678 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Increasing spring boot version #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions content-fs-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>content-fs-spring-boot-starter</artifactId>
Expand All @@ -13,12 +13,12 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-fs</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions content-jpa-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>content-jpa-spring-boot-starter</artifactId>

<dependencies>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-jpa</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions content-mongo-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>content-mongo-spring-boot-starter</artifactId>

<dependencies>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-mongo</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions content-rest-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>content-rest-spring-boot-starter</artifactId>
Expand All @@ -13,12 +13,12 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-rest</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions content-s3-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>content-s3-spring-boot-starter</artifactId>
Expand All @@ -13,12 +13,12 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-s3</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions content-solr-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>content-solr-spring-boot-starter</artifactId>
Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-solr</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Content</name>
Expand Down Expand Up @@ -50,8 +50,8 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>

<spring-content.version>${project.version}</spring-content.version>
<ginkgo4j-version>1.0.15</ginkgo4j-version>
<springboot-version>3.5.0</springboot-version>
<spring-cloud.version>2024.0.1</spring-cloud.version>
<springboot-version>4.0.0</springboot-version>
<spring-cloud.version>2025.0.0</spring-cloud.version>
<commonsio-version>2.20.0</commonsio-version>
<commons-lang.version>2.6</commons-lang.version>
<common-logging.version>1.3.5</common-logging.version>
Expand Down
22 changes: 11 additions & 11 deletions spring-content-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
Expand All @@ -21,25 +21,25 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-commons</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-fs</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-jpa</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-mongo</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -55,7 +55,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-renditions</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<!-- <dependency>-->
Expand All @@ -67,13 +67,13 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-rest</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-s3</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -85,7 +85,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-solr</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -107,7 +107,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-elasticsearch</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-versions-jpa</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spring-content-azure-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-commons</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-content-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>spring-content-bom</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions spring-content-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-versions-commons</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
6 changes: 3 additions & 3 deletions ...s/src/main/java/internal/org/springframework/content/commons/storeservice/StoresImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.springframework.content.commons.storeservice.StoreInfo;
import org.springframework.content.commons.storeservice.StoreResolver;
import org.springframework.content.commons.storeservice.Stores;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.core.TypeInformation;
import org.springframework.util.Assert;

public class StoresImpl implements Stores, InitializingBean {
Expand Down Expand Up @@ -50,13 +50,13 @@ public void afterPropertiesSet() {
if (ContentStore.class.isAssignableFrom(factory.getStoreInterface())) {
StoreInfo info = new StoreInfoImpl(
factory.getStoreInterface(),
ClassTypeInformation.from(factory.getStoreInterface()).getRequiredSuperTypeInformation(ContentStore.class).getTypeArguments().get(0).getType(),
TypeInformation.of(factory.getStoreInterface()).getRequiredSuperTypeInformation(ContentStore.class).getTypeArguments().get(0).getType(),
new StoreSupplier(this.factory, beanNameFromFactoryBeanName(name)));
storeInfos.add(info);
} else if (org.springframework.content.commons.store.ContentStore.class.isAssignableFrom(factory.getStoreInterface())) {
StoreInfo info = new StoreInfoImpl(
factory.getStoreInterface(),
ClassTypeInformation.from(factory.getStoreInterface()).getRequiredSuperTypeInformation(org.springframework.content.commons.store.ContentStore.class).getTypeArguments().get(0).getType(),
TypeInformation.of(factory.getStoreInterface()).getRequiredSuperTypeInformation(org.springframework.content.commons.store.ContentStore.class).getTypeArguments().get(0).getType(),
new StoreSupplier(this.factory, beanNameFromFactoryBeanName(name)));
storeInfos.add(info);
}
Expand Down
5 changes: 2 additions & 3 deletions ...java/org/springframework/content/commons/config/AbstractStoreBeanDefinitionRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@
import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.data.config.ParsingUtils;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.core.TypeInformation;
import org.springframework.data.util.Pair;
import org.springframework.data.util.TypeInformation;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
Expand Down Expand Up @@ -254,7 +253,7 @@ private void registerStoreFragmentImplementation(BeanDefinitionRegistry registry

Method method = ReflectionUtils.findMethod(implClass, "setGenericArguments", Class[].class);
if (method != null) {
List<TypeInformation<?>> types = ClassTypeInformation.from(storeClass).getSuperTypeInformation(ifaceClass).getTypeArguments();
List<TypeInformation<?>> types = TypeInformation.of(storeClass).getSuperTypeInformation(ifaceClass).getTypeArguments();
List<Class<?>> genericArguments = types.stream().map(TypeInformation::getType).collect(toList());
fragmentDefinition.getBeanDefinition().getPropertyValues().add("genericArguments", genericArguments.toArray(new Class[] {}));
}
Expand Down
5 changes: 2 additions & 3 deletions ...-commons/src/main/java/org/springframework/content/commons/utils/StoreInterfaceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
import org.springframework.content.commons.store.ContentStore;
import org.springframework.content.commons.store.ReactiveContentStore;
import org.springframework.content.commons.store.Store;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.Pair;
import org.springframework.data.util.TypeInformation;
import org.springframework.data.core.TypeInformation;
import org.springframework.util.Assert;

import java.io.Serializable;
Expand All @@ -31,7 +30,7 @@ public static Pair<Optional<Class<?>>, Class<? extends Serializable>> getStoreTy
};
for (Class<?> candidateStoreClass : candidateStoreClasses) {
try {
types = ClassTypeInformation.from(storeClass).getRequiredSuperTypeInformation(candidateStoreClass).getTypeArguments();
types = TypeInformation.of(storeClass).getRequiredSuperTypeInformation(candidateStoreClass).getTypeArguments();
break;
} catch (IllegalArgumentException iae) {
}
Expand Down
6 changes: 3 additions & 3 deletions spring-content-elasticsearch-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>spring-content</artifactId>
<groupId>com.github.paulcwarren</groupId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,12 +15,12 @@
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-elasticsearch</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.paulcwarren</groupId>
<artifactId>spring-content-autoconfigure</artifactId>
<version>3.0.17-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
Loading