Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
703ef70
Towards a first alpha release
egonw Dec 18, 2023
ee74ee6
Just compile
egonw Dec 18, 2023
7ff312c
Fixed Maven central hyperlink in readme
youphendriks Feb 21, 2024
2811b25
2 tests; valid works, invalid in progress
youphendriks Feb 28, 2024
ae8696c
Disabled in progress test
youphendriks Feb 28, 2024
c41f5fa
Changed name and added "." to JavaDoc.
youphendriks Mar 1, 2024
4c7a756
A bit more header clean up
egonw Mar 4, 2024
82194ff
Mockito added to pomfile
youphendriks Mar 8, 2024
893b3dd
Updated the GitHub Action versions
egonw Apr 8, 2024
84a3318
Cleaned test for issue240
youphendriks Apr 8, 2024
beb1f95
added assertNotNull/removed unused dependencies
youphendriks Apr 8, 2024
d67f80c
Test in the package where datasources can be initialized, solving the…
egonw Apr 8, 2024
ab90e81
Removed a wrong Bioregistry prefix
egonw Apr 8, 2024
a8ccf9e
Make sure we don't initialize twice (which fails)
egonw Apr 8, 2024
06075a0
Do not run when not having Java 11 or higher
egonw Jul 25, 2024
8c26b3e
Added some syntax highlighting
egonw Jul 25, 2024
62bf59a
BridgeDb Datasources 202407252
egonw Jul 25, 2024
4acbf4b
Use https for ChemSpider
egonw Jul 25, 2024
04b40cf
Only initialize if not done already
egonw Jul 25, 2024
8ea2ccf
Fixed a minor typo
egonw Jul 25, 2024
d61d170
Mock new datasources, to not cause URL overwrite errors
egonw Jul 25, 2024
960c22e
Updated to match the new BridgeDb Datasources version
egonw Jul 25, 2024
7c60cb1
Added Solanum tuberosum
egonw Jul 25, 2024
c023a89
Added the missing regexp
egonw Jul 25, 2024
d379ecb
Added another test
egonw Jul 25, 2024
4cccb3d
Tests may have registered things, so do a more realistic check
egonw Jul 25, 2024
6bf00da
More precise status message
egonw Jul 25, 2024
5ee961d
Support also https
egonw Jul 25, 2024
1f3bf40
More testing
egonw Jul 25, 2024
86e4517
More updates for the new BridgeDb Datasources release
egonw Jul 25, 2024
ee37c86
Different server id, to address a local ID conflict
egonw Jul 26, 2024
960746d
Newer MySQL driver
egonw Sep 21, 2024
0a42121
Newer Apache CFX version
egonw Sep 22, 2024
25158a0
Maven style
egonw Sep 22, 2024
27d7b12
Added a simple test
egonw Sep 22, 2024
00696d2
Restructured and added a mapping test
egonw Sep 22, 2024
601de87
Require minimal versions of Maven and Java
egonw Sep 22, 2024
9c88c0a
Updated Maven Jar plugin
egonw Sep 22, 2024
7047a9c
Central, updated Felix maven plugin
egonw Sep 22, 2024
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
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,24 @@ name: build

on:
push:
branches: [ series/4.0 ]
pull_request:
branches: [ series/4.0 ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
cache: maven
- name: Build with Maven
run: mvn clean install -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=true -Dproject.build.sourceEncoding=UTF-8 -Djunit5.excludeGroups=webservice,mysql
- name: push JaCoCo stats to codecov.io
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ BridgeDb
[![codecov](https://codecov.io/gh/bridgedb/BridgeDb/branch/master/graph/badge.svg?token=F0kJdoEt0x)](https://codecov.io/gh/bridgedb/BridgeDb)
[![NWO](https://img.shields.io/badge/NWO%20Open%20Science-203.001.121-orange)](https://www.nwo.nl/en/projects/203001121)

BridgeDb is currently tested with Java 11 and higher (3.0.x releases and master branch).
BridgeDb is currently tested with Java 17 and higher (4.0.x releases).

Using BridgeDb dependencies
---------------------------

The [BridgeDb releases](https://github.com/bridgedb/BridgeDb/releases) are published to
[Maven Central](http://central.maven.org/maven2/org/bridgedb/), which means you can use the BridgeDb JARs without needing to compile BridgeDb.
[Maven Central](https://search.maven.org/artifact/org.bridgedb/bridgedb-bundle), which means you can use the BridgeDb JARs without needing to compile BridgeDb.

Usage depends on which module you require. The examples below assumes artifact `org.bridgedb.bio` and version `3.1.0`:
Usage depends on which module you require. The examples below assumes artifact `org.bridgedb.bio` and version `4.0.0`:

For [Maven](https://maven.apache.org/):

Expand All @@ -24,27 +24,27 @@ For [Maven](https://maven.apache.org/):
<dependency>
<groupId>org.bridgedb</groupId>
<artifactId>org.bridgedb.bio</artifactId>
<version>3.1.0</version>
<version>4.0.0</version>
</dependency>
</dependencies>
```

For [Gradle](https://gradle.org/):

```gradle
compile group: 'org.bridgedb', name: 'org.bridgedb.bio', version: '3.1.0'
compile group: 'org.bridgedb', name: 'org.bridgedb.bio', version: '4.0.0'
```

For [Ivy](http://ant.apache.org/ivy/):

```xml
<dependency org="org.bridgedb" name="org.bridgedb.bio" rev="3.1.0"/>
<dependency org="org.bridgedb" name="org.bridgedb.bio" rev="4.0.0"/>
```

For [Buildr](https://buildr.apache.org/):

```buildr
'org.bridgedb:org.bridgedb.bio:jar:3.1.0'
'org.bridgedb:org.bridgedb.bio:jar:4.0.0'
```


Expand Down Expand Up @@ -133,7 +133,7 @@ To make the release, run the following commands. Mind you, this requires you
to have an approved Sonatype (http://oss.sonatype.org/) account with push rights:

```shell
mvn versions:set -DnewVersion=3.1.0
mvn versions:set -DnewVersion=4.0.0
mvn clean deploy
```

Expand Down
22 changes: 18 additions & 4 deletions UPGRADE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,49 @@
Upgrade notes to BridgeDb 2.0
# Upgrade notes to BridgeDb 2.0

1. Initialing data sources
## 1. Initialing data sources

Replace

```java
BioDataSource.init();
```

with

```java
DataSourceTxt.init();
```

2. Getting DataSource's
## 2. Getting DataSource's

Replace

```java
DataSource ds = DataSource.getBySystemCode("Ck");
```

with

```java
DataSource ds = DataSource.getExistingBySystemCode("Ck");
```

Similarly, and more important:

```java
DataSource ds = DataSource.getByFullName("PubChem-compound");
```

with

```java
DataSource ds = DataSource.getExistingByFullName("PubChem-compound");
```

The latter two new methods throw an IllegalArgumentException if the DataSource does not exist.
The latter two new methods throw an `IllegalArgumentException` if the `DataSource` does not exist.
Use one of the following two methods to check first:

```java
DataSource.systemCodeExists("Ck");
DataSource.fullNameExists("PubChem-compound");
```
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
%{$GeneTables{CCDS}} = ('NAME' => ['CCDS', 'Cc'],
'SYSTEM' => ["\'Consensus CDS Protein Set (NCBI)\'", "\'$dateArg\'",
"\'ID\|\'", "\'\|$species\|\'", "\'\'",
"\'http://www.ncbi.nlm.nih.gov/CCDS/CcdsBrowse.cgi?REQUEST=ALLFIELDS&DATA=~&ORGANISM=".$genus_species."\'", "\'\'",
"\'https://www.ncbi.nlm.nih.gov/CCDS/CcdsBrowse.cgi?REQUEST=ALLFIELDS&DATA=~&ORGANISM=".$genus_species."\'", "\'\'",
"\'ftp://ftp.ncbi.nlm.nih.gov/pub/CCDS/\'"],
'HEADER' => ['ID VARCHAR(128) NOT NULL DEFAULT \'\'',
'PRIMARY KEY (ID)'
Expand Down Expand Up @@ -863,7 +863,7 @@
%{$GeneTables{RGD}} = ('NAME' => ['RGD', 'R'],
'SYSTEM' => ["\'Rat Genome Database\'", "\'$dateArg\'",
"\'ID|Symbol\\\\sBF|Description\\\\BF|Synonyms\\\\BF\|\'", "\'\|$species\|\'", "\'\'",
"\'http://rgd.mcw.edu/query/query.cgi?id=~\'", "\'\'",
"\'https://rgd.mcw.edu/query/query.cgi?id=~\'", "\'\'",
"\'ftp://rgd.mcw.edu/pub/\'"],
'HEADER' => ['ID VARCHAR(128) NOT NULL DEFAULT \'\'',
'Symbol VARCHAR(128) NOT NULL DEFAULT \'\'',
Expand Down Expand Up @@ -916,8 +916,8 @@
%{$GeneTables{GrameneGenes}} = ('NAME' => ['GrameneGenes', 'Gg'],
'SYSTEM' => ["\'Gramene Genes Database\'", "\'$dateArg\'",
"\'ID|Symbol\\\\sBF|Description\\\\BF\|\'", "\'\|$species\|\'", "\'\'",
"\'http://www.gramene.org/db/genes/search_gene?acc=~\'", "\'\'",
"\'http://www.gramene.org\'"],
"\'https://www.gramene.org/db/genes/search_gene?acc=~\'", "\'\'",
"\'https://www.gramene.org\'"],
'HEADER' => ['ID VARCHAR(128) NOT NULL DEFAULT \'\'',
'Symbol VARCHAR(128) NOT NULL DEFAULT \'\'',
'Description VARCHAR(255) DEFAULT NULL',
Expand All @@ -926,8 +926,8 @@
%{$GeneTables{GramenePathway}} = ('NAME' => ['GramenePathway', 'Gm'],
'SYSTEM' => ["\'Gramene Pathway\'", "\'$dateArg\'",
"\'ID|Description\\\\BF\|\'", "\'\|$species\|\'", "\'\'",
"\'http://www.gramene.org/pathway\'", "\'\'",
"\'http://www.gramene.org/pathway\'"],
"\'https://www.gramene.org/pathway\'", "\'\'",
"\'https://www.gramene.org/pathway\'"],
'HEADER' => ['ID VARCHAR(128) NOT NULL DEFAULT \'\'',
'Description VARCHAR(255) DEFAULT NULL',
'PRIMARY KEY (ID)'
Expand Down
2 changes: 1 addition & 1 deletion org.bridgedb.bio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.2</version>
<version>${felix.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
Loading