Merge remote-tracking branch 'upstream/main' into dev

2021-11-21 12:14:26 +01:00
parent 1bd387413e b027a83aad
commit bc5c654154
33 changed files with 1012 additions and 8 deletions
--- a/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java
+++ b/tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java
@@ -29,6 +29,7 @@ public class TapasAuctionHouseApplication {

    private static ConfigurableEnvironment ENVIRONMENT;

+
    public static void main(String[] args) {
 		SpringApplication tapasAuctioneerApp = new SpringApplication(TapasAuctionHouseApplication.class);
        ENVIRONMENT = tapasAuctioneerApp.run(args).getEnvironment();
--- a/tapas-auction-house/src/main/resources/application.properties
+++ b/tapas-auction-house/src/main/resources/application.properties
@@ -1,5 +1,7 @@
 server.port=8086

+broker.mqtt=tcp://broker.hivemq.com
+
 websub.hub=https://websub.appspot.com/
 websub.hub.publish=https://websub.appspot.com/