Permalink
Browse files

Update pom and dependencies

  • Loading branch information...
tferr committed Dec 6, 2018
1 parent d35aec1 commit e9bf7e0b55b1e532ea52c8e5083901eeca791867
Showing with 7 additions and 6 deletions.
  1. +5 −4 pom.xml
  2. +2 −2 src/main/java/tracing/gui/FADerivedIcon.java
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>23.2.0</version>
<version>24.0.0</version>
<relativePath />
</parent>
@@ -109,7 +109,8 @@
<!-- NB: Deploy releases to the ImageJ Maven repository. -->
<releaseProfiles>deploy-to-imagej</releaseProfiles>
<Sholl_Analysis.version>3.7.4-SNAPSHOT</Sholl_Analysis.version>
<Sholl_Analysis.version>3.7.4</Sholl_Analysis.version>
<imagej.app.directory>${env.HOME}/Fiji-neuroanatomy-upload.app</imagej.app.directory>
</properties>
<repositories>
@@ -219,7 +220,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.11.0</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -229,7 +230,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>5.3.1</version>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>net.imagej</groupId>
@@ -54,9 +54,9 @@
public class FADerivedIcon implements Icon {
private static final String AWESOME_REGULAR =
"META-INF/resources/webjars/font-awesome/5.3.1/webfonts/fa-regular-400.ttf";
"META-INF/resources/webjars/font-awesome/5.5.0/webfonts/fa-regular-400.ttf";
private static final String AWESOME_SOLID =
"META-INF/resources/webjars/font-awesome/5.3.1/webfonts/fa-solid-900.ttf";
"META-INF/resources/webjars/font-awesome/5.5.0/webfonts/fa-solid-900.ttf";
private static final int DEF_SIZE = UIManager.getFont("Label.font").getSize();
private final Font font;
private final float size;

0 comments on commit e9bf7e0

Please sign in to comment.