Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit 1ceb307

Browse files
ahemaidahemaid
committed
upgrade spring-boot-starter-parent to 2.6.6
1 parent d0043d6 commit 1ceb307

File tree

5 files changed

+61
-170
lines changed

5 files changed

+61
-170
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-parent</artifactId>
27-
<version>2.5.4</version>
27+
<version>2.6.6</version>
2828
<relativePath/>
2929
<!-- lookup parent from repository -->
3030
</parent>
@@ -190,11 +190,11 @@
190190
<version>${springframework.version}</version>
191191
</dependency>
192192

193-
<dependency>
194-
<groupId>org.springframework</groupId>
195-
<artifactId>spring-context</artifactId>
196-
<version>${springframework.version}</version>
197-
</dependency>
193+
<!-- <dependency>-->
194+
<!-- <groupId>org.springframework</groupId>-->
195+
<!-- <artifactId>spring-context</artifactId>-->
196+
<!-- <version>${springframework.version}</version>-->
197+
<!-- </dependency>-->
198198

199199
<dependency>
200200
<groupId>org.springframework</groupId>
@@ -226,6 +226,13 @@
226226
<version>${springframework.version}</version>
227227
</dependency>
228228

229+
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.springframework/spring-expression &ndash;&gt;-->
230+
<dependency>
231+
<groupId>org.springframework</groupId>
232+
<artifactId>spring-expression</artifactId>
233+
<version>${springframework.version}</version>
234+
</dependency>
235+
229236
<dependency>
230237
<groupId>org.springframework.boot</groupId>
231238
<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -241,10 +248,10 @@
241248
<groupId>org.springframework.boot</groupId>
242249
<artifactId>spring-boot-starter</artifactId>
243250
<exclusions>
244-
<exclusion>
245-
<groupId>org.springframework.boot</groupId>
246-
<artifactId>spring-boot-starter-logging</artifactId>
247-
</exclusion>
251+
<exclusion>
252+
<groupId>org.springframework.boot</groupId>
253+
<artifactId>spring-boot-starter-logging</artifactId>
254+
</exclusion>
248255
</exclusions>
249256
</dependency>
250257

@@ -348,11 +355,11 @@
348355
<version>${okhttp.version}</version>
349356
</dependency>
350357

351-
<dependency>
352-
<groupId>com.fasterxml.jackson.core</groupId>
353-
<artifactId>jackson-databind</artifactId>
354-
<version>${jackson-databind.version}</version>
355-
</dependency>
358+
<!-- <dependency>-->
359+
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
360+
<!-- <artifactId>jackson-databind</artifactId>-->
361+
<!-- <version>${jackson-databind.version}</version>-->
362+
<!-- </dependency>-->
356363

357364
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
358365
<dependency>
@@ -653,22 +660,22 @@
653660
<groupId>net.sourceforge.pmd</groupId>
654661
<artifactId>pmd-core</artifactId>
655662
<version>${pmd.version}</version>
656-
</dependency>
657-
<dependency>
663+
</dependency>
664+
<dependency>
658665
<groupId>net.sourceforge.pmd</groupId>
659666
<artifactId>pmd-java</artifactId>
660667
<version>${pmd.version}</version>
661-
</dependency>
662-
<dependency>
668+
</dependency>
669+
<dependency>
663670
<groupId>net.sourceforge.pmd</groupId>
664671
<artifactId>pmd-javascript</artifactId>
665672
<version>${pmd.version}</version>
666-
</dependency>
667-
<dependency>
673+
</dependency>
674+
<dependency>
668675
<groupId>net.sourceforge.pmd</groupId>
669676
<artifactId>pmd-jsp</artifactId>
670677
<version>${pmd.version}</version>
671-
</dependency>
678+
</dependency>
672679
</dependencies>
673680
</plugin>
674681
<plugin>
@@ -762,19 +769,19 @@
762769
<buildDirectory>${project.build.directory}</buildDirectory>
763770
</systemPropertyVariables>
764771
</configuration>
765-
<executions>
766-
<execution>
767-
<phase>integration-test</phase>
768-
<goals>
769-
<goal>test</goal>
770-
</goals>
771-
<configuration>
772-
<includes>
773-
<include>**/*IT</include>
774-
</includes>
775-
</configuration>
776-
</execution>
777-
</executions>
772+
<executions>
773+
<execution>
774+
<phase>integration-test</phase>
775+
<goals>
776+
<goal>test</goal>
777+
</goals>
778+
<configuration>
779+
<includes>
780+
<include>**/*IT</include>
781+
</includes>
782+
</configuration>
783+
</execution>
784+
</executions>
778785
</plugin>
779786
<plugin>
780787
<groupId>com.mycila</groupId>
@@ -846,9 +853,9 @@
846853
<targetTests>
847854
<param>io.dataspaceconnector.model*</param>
848855
</targetTests>
849-
<!-- <excludedTestClasses>-->
850-
<!-- <param>**</param>-->
851-
<!-- </excludedTestClasses>-->
856+
<!-- <excludedTestClasses>-->
857+
<!-- <param>**</param>-->
858+
<!-- </excludedTestClasses>-->
852859
<mutators>
853860
<mutator>ALL</mutator>
854861
</mutators>
@@ -876,7 +883,7 @@
876883
<artifactId>maven-project-info-reports-plugin</artifactId>
877884
<version>${maven-project-info-reports-plugin.version}</version>
878885
</plugin>
879-
</plugins>
886+
</plugins>
880887
</build>
881888

882889
<reporting>
@@ -901,7 +908,7 @@
901908
</reportSet>
902909
</reportSets>
903910
</plugin>
904-
<plugin>
911+
<plugin>
905912
<groupId>org.apache.maven.plugins</groupId>
906913
<artifactId>maven-pmd-plugin</artifactId>
907914
</plugin>
@@ -943,24 +950,24 @@
943950
<configuration>
944951
<tagListOptions>
945952
<tagClasses>
946-
<tagClass>
947-
<displayName>TODO</displayName>
948-
<tags>
949-
<tag>
950-
<matchString>TODO</matchString>
951-
<matchType>exact</matchType>
952-
</tag>
953-
</tags>
954-
</tagClass>
953+
<tagClass>
954+
<displayName>TODO</displayName>
955+
<tags>
956+
<tag>
957+
<matchString>TODO</matchString>
958+
<matchType>exact</matchType>
959+
</tag>
960+
</tags>
961+
</tagClass>
955962
</tagClasses>
956-
</tagListOptions>
963+
</tagListOptions>
957964
</configuration>
958965
</plugin>
959966
<plugin>
960967
<groupId>org.apache.maven.plugins</groupId>
961968
<artifactId>maven-surefire-report-plugin</artifactId>
962969
<version>${maven-surefire-plugin.version}</version>
963-
</plugin>
970+
</plugin>
964971
<plugin>
965972
<groupId>org.pitest</groupId>
966973
<artifactId>pitest-maven</artifactId>

‎src/main/resources/application.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ spring.security.user.password=password
2828
spring.security.app.name=app
2929
spring.security.app.password=password
3030

31+
spring.main.allow-circular-references= true
3132
server.error.whitelabel.enabled=true
3233

3334
# Handles Headers by the framework if using a reverse proxy
@@ -170,9 +171,9 @@ spring.jpa.properties.hibernate.search.backend.directory.root = /data/search
170171
####################################################################################################
171172
## Connection of IDS AppStore to Container Registry ##
172173
####################################################################################################
173-
# The contaier registry hostname, use now AppStore hostname
174+
# The contaier registry hostname, use now AppStore hostname
174175
registry.host=registry.example.org
175-
# The container registry url, , use now AppStore url
176+
# The container registry url, , use now AppStore url
176177
registry.url=https://registry.example.org
177178
# The container registry project to use for this appstore instance
178179
registry.project=ids-binac

0 commit comments

Comments
 (0)