Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
# connect it to localhost (password: password) to observe
# the graphical output of these tests.

FROM openjdk:11
FROM debian:stable
WORKDIR /beast2

# Install Apache Ant
RUN apt-get update && apt-get install -y ant
RUN apt-get update && apt-get install -y openjdk-21-jdk openjfx ant

# Install and configure VNC server
RUN apt-get update && apt-get install -y tightvncserver twm
Expand All @@ -30,7 +30,7 @@ RUN echo password | vncpasswd -f > /root/.vnc/passwd
RUN chmod 600 /root/.vnc/passwd

# Install BEAGLE
RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config
RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config git
# use latest release v3.1.2, issue #786
RUN cd /root && git clone --branch v3.1.2 --depth=1 https://github.com/beagle-dev/beagle-lib.git
RUN cd /root/beagle-lib && ./autogen.sh && ./configure --prefix=/usr/local && make install
Expand Down
11 changes: 8 additions & 3 deletions src/beast/pkgmgmt/PackageManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,14 @@ private static void loadURL(URL url, InputStream is, Map<String, Package> packag

PackageVersion packageVersion = new PackageVersion(element.getAttribute("version"));

if (element.hasAttribute("projectURL") &&
!(pkg.getLatestVersion() != null && packageVersion.compareTo(pkg.getLatestVersion())<0))
pkg.setProjectURL(new URL(element.getAttribute("projectURL")));
if (element.hasAttribute("projectURL") &&
!(pkg.getLatestVersion() != null && packageVersion.compareTo(pkg.getLatestVersion()) < 0)) {
try {
pkg.setProjectURL(new URL(element.getAttribute("projectURL")));
} catch (MalformedURLException ex) {
System.err.println("Error parsing projectURL: " + ex.getMessage());
}
}

Set<PackageDependency> packageDependencies = new HashSet<PackageDependency>();
NodeList depNodes = element.getElementsByTagName("depends");
Expand Down