Skip to content
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

Jump to bottom

IKASAN-2340 sorting out errorReportingServiceInvocation bean clash. C… #1274

Merged
merged 1 commit into from
Feb 6, 2024
Merged

IKASAN-2340 sorting out errorReportingServiceInvocation bean clash. C… #1274

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
2 changes: 0 additions & 2 deletions ...s-im/src/main/resources/archetype-resources/jar/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ module.java.command=java -server -Xms256m -Xmx256m -XX:MaxMetaspaceSize=128m -Ds
spring.liquibase.change-log=classpath:db-changelog-master.xml
spring.liquibase.enabled=true

spring.main.allow-bean-definition-overriding=true

# health probs and remote management (optional)
management.endpoints.enabled-by-default=false
management.endpoint.info.enabled=true
Expand Down
1 change: 0 additions & 1 deletion ...rces/jar/src/test/java/com/ikasan/sample/spring/boot/builderpattern/FtpToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@

@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class FtpToJmsFlowTest
Expand Down
1 change: 0 additions & 1 deletion ...rces/jar/src/test/java/com/ikasan/sample/spring/boot/builderpattern/JmsToFtpFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class JmsToFtpFlowTest
Expand Down
2 changes: 0 additions & 2 deletions ...s-im/src/main/resources/archetype-resources/jar/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ module.java.command=java -server -Xms256m -Xmx256m -XX:MaxMetaspaceSize=128m -Ds
spring.liquibase.change-log=classpath:db-changelog-master.xml
spring.liquibase.enabled=true

spring.main.allow-bean-definition-overriding=true

# health probs and remote management (optional)
management.endpoints.enabled-by-default=false
management.endpoint.info.enabled=true
Expand Down
1 change: 0 additions & 1 deletion ...ces/jar/src/test/java/com/ikasan/sample/spring/boot/builderpattern/JmsToSftpFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class JmsToSftpFlowTest
Expand Down
1 change: 0 additions & 1 deletion ...ces/jar/src/test/java/com/ikasan/sample/spring/boot/builderpattern/SftpToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class SftpToJmsFlowTest
Expand Down
2 changes: 1 addition & 1 deletion ...r-reporting/src/main/java/org/ikasan/error/reporting/ErrorReportingAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Properties;

@Configuration
@ImportResource("/transaction.xml")
@ImportResource("/error-reporting-transaction.xml")
public class ErrorReportingAutoConfiguration
{
@Bean
Expand Down
0 ...orting/src/main/resources/transaction.xml → ...resources/error-reporting-transaction.xml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion .../ftp-jms/src/test/java/com/ikasan/sample/spring/boot/builderpattern/FtpToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@

@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class FtpToJmsFlowTest
Expand Down
1 change: 0 additions & 1 deletion .../ftp-jms/src/test/java/com/ikasan/sample/spring/boot/builderpattern/JmsToFtpFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class JmsToFtpFlowTest
Expand Down
1 change: 0 additions & 1 deletion ...ed/src/test/java/com/ikasan/sample/spring/boot/builderpattern/ScheduledToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@Sql(scripts = {"/cleanErrorTables.sql"}, executionPhase = AFTER_TEST_METHOD)
Expand Down
3 changes: 0 additions & 3 deletions ...src/test/java/com/ikasan/sample/spring/boot/builderpattern/JmsToSftpChunkingFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@Sql(scripts = {"/cleanChunkingTables.sql"}, executionPhase = AFTER_TEST_METHOD)
Expand All @@ -102,8 +101,6 @@ public class JmsToSftpChunkingFlowTest
public IkasanFlowTestRule sftpToJmsChunkingFlowTestRule = new IkasanFlowTestRule( );
public IkasanFlowTestRule jmsToSftpChunkingFlowTestRule = new IkasanFlowTestRule( );

// @Rule
// public FakeSftpServerRule sftp = new FakeSftpServerRule().addUser("test", "test");

String homeDir;

Expand Down
1 change: 0 additions & 1 deletion ...ftp-jms/src/test/java/com/ikasan/sample/spring/boot/builderpattern/JmsToSftpFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class JmsToSftpFlowTest
Expand Down
1 change: 0 additions & 1 deletion ...src/test/java/com/ikasan/sample/spring/boot/builderpattern/SftpChunkingToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@Sql(scripts = {"/cleanChunkingTables.sql"}, executionPhase = AFTER_TEST_METHOD)
Expand Down
1 change: 0 additions & 1 deletion ...ftp-jms/src/test/java/com/ikasan/sample/spring/boot/builderpattern/SftpToJmsFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Application.class},
properties = {"spring.main.allow-bean-definition-overriding=true"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class SftpToJmsFlowTest {
Expand Down