Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various dep updates #15

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
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
5 changes: 3 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
# test against latest update of each major Java version:
java: [ 8, 11, 17, 21 ]
# test against major operating systems
os: [ubuntu-20.04, windows-latest, macos-latest]
os: [ubuntu-22.04, windows-latest, macos-latest]
name: Java ${{ matrix.java }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -26,7 +27,7 @@ jobs:
- name: Setup java
uses: actions/setup-java@v3
with:
distribution: 'adopt'
distribution: 'zulu'
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B clean test javadoc:javadoc package
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.51.v20230217</version>
<version>9.4.55.v20240627</version>
<configuration>
<httpConnector>
<port>8989</port>
Expand Down Expand Up @@ -116,22 +116,22 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>com.epam.indigo</groupId>
<artifactId>indigo</artifactId>
<version>1.14.0</version>
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>com.epam.indigo</groupId>
<artifactId>indigo-renderer</artifactId>
<version>1.14.0</version>
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- change title and metadata for each page here -->
<link rel="stylesheet" href="opsin.css" type="text/css" media="all" />
<title>OPSIN: Open Parser for Systematic IUPAC Nomenclature</title>
<script src="jquery-1.12.4.min.js"></script>
<script src="jquery-3.7.1.min.js"></script>
<script src="opsin.js?v=20231203"></script>
<style media="all">
div#content-primary img#depiction {
Expand Down Expand Up @@ -120,7 +120,7 @@ <h3 title="Chemical Markup Language">CML:</h3>
<dd><a href="https://github.com/dan2097/opsin/releases">Downloads</a></dd>
<dd><a href="information.html">Information</a></dd>
<dd><a href="instructions.html">Instructions</a></dd>
<dd><a href="https://www.javadoc.io/doc/uk.ac.cam.ch.opsin/opsin-core/2.7.0">JavaDoc</a></dd>
<dd><a href="https://www.javadoc.io/doc/uk.ac.cam.ch.opsin/opsin-core/2.8.0">JavaDoc</a></dd>
<dd><a href="https://pubs.acs.org/doi/full/10.1021/ci100384d">Journal Article</a></dd>
<dd><a href="https://pubs.acs.org/articlesonrequest/AOR-PcYgSy87ettZWfqyvHmN">Journal Article (Free access)</a></dd>
<dd><a href="https://github.com/dan2097/opsin/issues">Issue tracker</a></dd>
Expand Down
5 changes: 0 additions & 5 deletions src/main/webapp/jquery-1.12.4.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/webapp/jquery-3.7.1.min.js

Large diffs are not rendered by default.

Loading