Skip to content

Commit c3c535e

Browse files
author
Jan Schraff
committed
Merge branch 'develop' into feature/optional_note_reminder
2 parents ebee9bc + cd1c5fa commit c3c535e

File tree

8 files changed

+288
-161
lines changed

8 files changed

+288
-161
lines changed

pom.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
<relativePath /> <!-- lookup parent from repository -->
3232
</parent>
3333

34+
<repositories>
35+
<!-- Including for fontawesome -->
36+
<repository>
37+
<id>fontawesomefx-repo</id>
38+
<name>FontAwesome Repository</name>
39+
<url>https://bintray.com/jerady/maven/FontAwesomeFX</url>
40+
</repository>
41+
</repositories>
42+
3443
<properties>
3544
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3645
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -93,13 +102,13 @@
93102
<version>3.1.1</version>
94103
<type>maven-plugin</type>
95104
</dependency>
96-
105+
97106
<dependency>
98107
<groupId>de.jensd</groupId>
99108
<artifactId>fontawesomefx-commons</artifactId>
100109
<version>8.15</version>
101110
</dependency>
102-
111+
103112
<dependency>
104113
<groupId>de.jensd</groupId>
105114
<artifactId>fontawesomefx-fontawesome</artifactId>
@@ -144,7 +153,7 @@
144153
<failOnError>${maven-dependency-check.failOnError}</failOnError>
145154
<failBuildOnCVSS>${maven-dependency-check.failBuildOnCVSS}</failBuildOnCVSS>
146155
<outputDirectory>target/site</outputDirectory>
147-
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile-->
156+
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile -->
148157
</configuration>
149158
<executions>
150159
<execution>
@@ -184,7 +193,7 @@
184193
<failOnError>${maven-dependency-check.failOnError}</failOnError>
185194
<failBuildOnCVSS>${maven-dependency-check.failBuildOnCVSS}</failBuildOnCVSS>
186195
<outputDirectory>target/site</outputDirectory>
187-
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile-->
196+
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile -->
188197
</configuration>
189198
</plugin>
190199
</plugins>

0 commit comments

Comments
 (0)