Skip to content

Commit 2190b4d

Browse files
committed
Merge branch 'development'
# Conflicts: # singa-chemistry/src/test/java/bio/singa/chemistry/features/logp/LogPTest.java # singa-mathematics/src/main/java/bio/singa/mathematics/geometry/faces/Polygons.java # singa-mathematics/src/main/java/bio/singa/mathematics/intervals/Sampler.java
2 parents d7a17f1 + 5248cbb commit 2190b4d

File tree

421 files changed

+11858
-9840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

421 files changed

+11858
-9840
lines changed

.idea/libraries/Maven__tec_units_indriya_1_0.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__tec_uom_uom_se_1_0_8.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__uk_ac_ebi_beam_beam_core_1_2_1.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__uk_ac_ebi_beam_beam_func_1_2_1.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE.md

Lines changed: 21 additions & 674 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SiNGA is deployed to the [Maven Central Repository](https://mvnrepository.com/ar
1717
<dependency>
1818
<groupId>bio.singa</groupId>
1919
<artifactId>singa-[module]</artifactId>
20-
<version>0.5.0</version>
20+
<version>0.6.0</version>
2121
</dependency>
2222
<!-- more dependencies -->
2323
</dependencies>

singa-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<packaging>pom</packaging>
88
<groupId>bio.singa</groupId>
99
<artifactId>singa-all</artifactId>
10-
<version>0.5.0</version>
10+
<version>0.6.0</version>
1111
<name>singa-all</name>
1212
<description>
1313
SiNGA (Simulation of Natural Systems using Graph Automata) is an open-source library containing tools especially

singa-chemistry/pom.xml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,44 @@
77
<parent>
88
<artifactId>singa-all</artifactId>
99
<groupId>bio.singa</groupId>
10-
<version>0.5.0</version>
10+
<version>0.6.0</version>
1111
<relativePath>../singa-all/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>singa-chemistry</artifactId>
15-
<version>0.5.0</version>
15+
<version>0.6.0</version>
1616
<packaging>jar</packaging>
1717
<description>
1818
The chemistry package of SiNGA handles aspects that range into chemoinformatics, such as parsing and
1919
manipulation of chemical entities as well as their annotation with features.
2020
</description>
2121

22+
<repositories>
23+
<repository>
24+
<id>ebi-repo</id>
25+
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/</url>
26+
</repository>
27+
<repository>
28+
<id>ebi-repo-snapshots</id>
29+
<url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo-snapshots/</url>
30+
</repository>
31+
</repositories>
32+
2233
<dependencies>
2334
<dependency>
2435
<groupId>bio.singa</groupId>
2536
<artifactId>singa-structure</artifactId>
26-
<version>0.5.0</version>
37+
<version>0.6.0</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>uk.ac.ebi.beam</groupId>
41+
<artifactId>beam-core</artifactId>
42+
<version>1.2.1</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>uk.ac.ebi.beam</groupId>
46+
<artifactId>beam-func</artifactId>
47+
<version>1.2.1</version>
2748
</dependency>
2849
</dependencies>
2950

singa-chemistry/singa-chemistry.iml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<orderEntry type="module" module-name="singa-mathematics" />
2222
<orderEntry type="module" module-name="singa-core" />
2323
<orderEntry type="module" module-name="singa-features" />
24-
<orderEntry type="library" name="Maven: tec.uom:uom-se:1.0.8" level="project" />
24+
<orderEntry type="library" name="Maven: tec.units:indriya:1.0" level="project" />
2525
<orderEntry type="library" name="Maven: javax.measure:unit-api:1.0" level="project" />
2626
<orderEntry type="library" name="Maven: tec.uom.lib:uom-lib-common:1.0.2" level="project" />
2727
<orderEntry type="library" name="Maven: org.rcsb:mmtf-codec:1.0.8" level="project" />
@@ -34,6 +34,8 @@
3434
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
3535
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
3636
<orderEntry type="library" name="Maven: org.rcsb:mmtf-api:1.0.8" level="project" />
37+
<orderEntry type="library" name="Maven: uk.ac.ebi.beam:beam-core:1.2.1" level="project" />
38+
<orderEntry type="library" name="Maven: uk.ac.ebi.beam:beam-func:1.2.1" level="project" />
3739
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.3.1" level="project" />
3840
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
3941
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />

0 commit comments

Comments
 (0)