Skip to content
This repository was archived by the owner on Oct 13, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion alpha/alpha-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
<spring.boot.version>2.0.0.RELEASE</spring.boot.version>
<spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
<!-- Need to add the dependency of log4j2 core -->
<dependencies>
Expand Down
9 changes: 9 additions & 0 deletions omega/omega-spring-tx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,13 @@

</dependencies>

<profiles>
<profile>
<id>spring-boot-2</id>
<properties>
<spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void sendsUserToRemote_AroundTransaction() throws Exception {
toArray(messages)
);

User actual = userRepository.findOne(user.id());
User actual = userRepository.findByUsername(user.username());
assertThat(actual, is(user));
}

Expand Down Expand Up @@ -169,8 +169,8 @@ public void compensateOnTransactionException() throws Exception {
messageHandler.onReceive(globalTxId, newLocalTxId, globalTxId, compensationMethod, user);
messageHandler.onReceive(globalTxId, anotherLocalTxId, localTxId, compensationMethod, anotherUser);

assertThat(userRepository.findOne(user.id()), is(nullValue()));
assertThat(userRepository.findOne(anotherUser.id()), is(nullValue()));
assertThat(userRepository.findByUsername(user.username()), is(nullValue()));
assertThat(userRepository.findByUsername(anotherUser.username()), is(nullValue()));

assertArrayEquals(
new String[]{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ User add(User user) {
}

void delete(User user) {
userRepository.delete(user.id());
userRepository.delete(user);
}
}
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<kamon.version>0.6.7</kamon.version>
<log4j.version>2.6.2</log4j.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
<spring.boot2.version>2.0.1.RELEASE</spring.boot2.version>
<spring.cloud.version>Camden.SR6</spring.cloud.version>
<java.chassis.version>0.5.0</java.chassis.version>
<spring.version>4.3.7.RELEASE</spring.version>
Expand Down
2 changes: 1 addition & 1 deletion saga-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
<spring.boot.version>2.0.0.RELEASE</spring.boot.version>
<spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
<!-- Need to add the dependency of log4j2 core -->
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion saga-persistence/saga-persistence-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
<spring.boot.version>2.0.0.RELEASE</spring.boot.version>
<spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
</profile>
</profiles>
Expand Down