Skip to content

Commit 52a14ca

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #114 from xdev-software/develop
v1.0.9
2 parents fe06915 + f374528 commit 52a14ca

54 files changed

Lines changed: 535 additions & 219 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
131131

132132
- name: Publish to Apache Maven Central
133-
run: ../mvnw -B deploy -Possrh
133+
run: ../mvnw -B deploy -Possrh -DskipTests
134134
env:
135135
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
136136
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
@@ -157,7 +157,7 @@ jobs:
157157
cache: 'maven'
158158

159159
- name: Build site
160-
run: ../mvnw -B site
160+
run: ../mvnw -B compile site -DskipTests -T2C
161161
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162162

163163
- name: Deploy to Github pages
@@ -186,7 +186,7 @@ jobs:
186186
for i in "${modules[@]}"
187187
do
188188
echo "Processing $i/pom.xml"
189-
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
189+
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true -DupdateMatchingVersions=false)
190190
done
191191
192192
- name: Git Commit and Push

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ storage-jpa
8686
.idea/codeStyles/*
8787
!.idea/codeStyles/codeStyleConfig.xml
8888
!.idea/codeStyles/Project.xml
89+
/spring-data-eclipse-store-demo/storage-complex

‎.idea/saveactions_settings.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 1.0.9
2+
3+
* Inherited entities with repositories are now realized by reading (finding coherent repositories) and not by writing
4+
* Multiple restarts of the storage at initial startup is now fixed
5+
16
# 1.0.8
27

38
* Entities with same ID are replaced on saved and not added

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/spring-data-eclipse-store?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/spring-data-eclipse-store)
22
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/spring-data-eclipse-store/check-build.yml?branch=develop)](https://github.com/xdev-software/spring-data-eclipse-store/actions/workflows/check-build.yml?query=branch%3Adevelop)
33
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_spring-data-eclipse-store&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_spring-data-eclipse-store)
4+
[![Documentation](https://img.shields.io/maven-central/v/software.xdev/spring-data-eclipse-store?label=docs)](https://spring-eclipsestore.xdev.software/)
45

56
<div align="center">
67
<img src="assets/Logo.png" height="200" alt="XDEV Spring-Data Eclipse-Store Logo">

‎docs/modules/ROOT/pages/known-issues.adoc‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,23 @@ There is a library to version your data in the store called https://github.com/x
2929
This helps you keep your data up to date regardless of the current version.
3030

3131
We created https://github.com/xdev-software/spring-data-eclipse-store/issues/33[an issue] for that but right now we *do not support XDEVs MicroMigration*.
32+
33+
== Spring Developer Tools
34+
35+
Using https://docs.spring.io/spring-boot/reference/using/devtools.html[Spring Developer Tools] (`spring-boot-devtools`) can lead to serious issues in your project.
36+
That is manly due to the https://docs.spring.io/spring-boot/reference/using/devtools.html#using.devtools.livereload[LiveReload feature] and the usage of a "Restart Classloader".
37+
38+
This leads to problems within EclipseStore and can cause issues with discovering beans (https://github.com/spring-projects/spring-boot/issues/41011[Example Issue]).
39+
40+
If you must use the Spring Developer Tools, make sure to https://docs.spring.io/spring-boot/reference/using/devtools.html#using.devtools.restart.disable[disable restart].
41+
42+
[source,java,title="Example how to disable restart"]
43+
----
44+
@SpringBootApplication
45+
public class MyApplication {
46+
public static void main(String[] args) {
47+
System.setProperty("spring.devtools.restart.enabled", "false");
48+
SpringApplication.run(MyApplication.class, args);
49+
}
50+
}
51+
----

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
<dependency>
9494
<groupId>net.sourceforge.pmd</groupId>
9595
<artifactId>pmd-core</artifactId>
96-
<version>7.2.0</version>
96+
<version>7.3.0</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>net.sourceforge.pmd</groupId>
100100
<artifactId>pmd-java</artifactId>
101-
<version>7.2.0</version>
101+
<version>7.3.0</version>
102102
</dependency>
103103
</dependencies>
104104
</plugin>

‎renovate.json5‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
"maven"
1010
],
1111
"enabled": false
12+
},
13+
{
14+
"description": "Group net.sourceforge.pmd",
15+
"matchPackagePatterns": [
16+
"^net.sourceforge.pmd"
17+
],
18+
"datasources": [
19+
"maven"
20+
],
21+
"groupName": "net.sourceforge.pmd"
1222
}
1323
]
1424
}

‎spring-data-eclipse-store-benchmark/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>spring-data-eclipse-store-benchmark</artifactId>
12-
<version>1.0.10-SNAPSHOT</version>
12+
<version>1.0.9-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414

1515
<inceptionYear>2023</inceptionYear>

‎spring-data-eclipse-store-demo/pom.xml‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-demo</artifactId>
14-
<version>1.0.10-SNAPSHOT</version>
14+
<version>1.0.9-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>
@@ -62,6 +62,34 @@
6262
<groupId>org.springframework.boot</groupId>
6363
<artifactId>spring-boot-autoconfigure</artifactId>
6464
</dependency>
65+
66+
67+
<dependency>
68+
<groupId>org.junit.jupiter</groupId>
69+
<artifactId>junit-jupiter</artifactId>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.junit.jupiter</groupId>
74+
<artifactId>junit-jupiter</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.junit.jupiter</groupId>
79+
<artifactId>junit-jupiter</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.springframework.boot</groupId>
84+
<artifactId>spring-boot-starter-test</artifactId>
85+
<exclusions>
86+
<exclusion>
87+
<artifactId>spring-boot-starter-logging</artifactId>
88+
<groupId>org.springframework.boot</groupId>
89+
</exclusion>
90+
</exclusions>
91+
<scope>test</scope>
92+
</dependency>
6593
</dependencies>
6694

6795
<build>
@@ -88,9 +116,22 @@
88116
<jvmArguments>
89117
--add-opens java.base/java.util=ALL-UNNAMED
90118
--add-opens java.base/java.time=ALL-UNNAMED
119+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
91120
</jvmArguments>
92121
</configuration>
93122
</plugin>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-surefire-plugin</artifactId>
126+
<version>3.3.0</version>
127+
<configuration>
128+
<argLine>
129+
--add-opens java.base/java.util=ALL-UNNAMED
130+
--add-opens java.base/java.time=ALL-UNNAMED
131+
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
132+
</argLine>
133+
</configuration>
134+
</plugin>
94135
</plugins>
95136
</build>
96137
</project>

0 commit comments

Comments
 (0)