mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +00:00
Merge remote-tracking branch 'origin/Story1247_AutoDiscovery' into NewUI
# Conflicts: # pom.xml # src/main/java/seng302/App.java # src/main/java/seng302/visualiser/controllers/StartScreenController.java # src/main/resources/views/StartScreenView.fxml
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@@ -77,6 +76,13 @@
|
||||
<version>1.8.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/javax.jmdns/jmdns -->
|
||||
<dependency>
|
||||
<groupId>javax.jmdns</groupId>
|
||||
<artifactId>jmdns</artifactId>
|
||||
<version>3.4.2</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -159,4 +165,12 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>Homer-Core</id>
|
||||
<name>Homer-core-repo</name>
|
||||
<url>https://nexus.arcsmed.at/content/repositories/homer.core</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
Reference in New Issue
Block a user