Skip to content

Commit ec972c7

Browse files
committed
Consolidate to single artifact: io.github.compevol:morph-models
Merge beast-morph-models and beast-morph-models-fx into one Maven artifact and one JPMS module (morph.models). BEAUti class uses requires static beast.fx so the module loads without JavaFX at runtime. Renamed from beast-morph-models to morph-models to keep Eclipse project lists uncluttered (all beast-* packages were intermixing with beast3 core modules).
1 parent 0a63bf4 commit ec972c7

File tree

18 files changed

+165
-312
lines changed

18 files changed

+165
-312
lines changed

README.md

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ Models for discrete morphological character data in [BEAST 3](https://github.com
55

66
Implements the Lewis MK and MKv substitution models (Lewis, 2001), along with ordinal and nested ordinal variants for ordered character data.
77

8-
## Modules
9-
10-
- **beast-morph-models** — core substitution models and alignment classes (depends on `beast-base`)
11-
- **beast-morph-models-fx** — BEAUti integration (depends on `beast-fx`)
12-
138
## Substitution models
149

1510
| Class | Description |
@@ -20,29 +15,14 @@ Implements the Lewis MK and MKv substitution models (Lewis, 2001), along with or
2015

2116
## Building
2217

23-
BEAST 3 dependencies are resolved from [GitHub Packages](https://github.com/CompEvol/beast3/packages) (or Maven Central, if published there). For GitHub Packages, add a [personal access token](https://github.com/settings/tokens) (classic) with `read:packages` scope to `~/.m2/settings.xml`:
24-
25-
```xml
26-
<settings>
27-
<servers>
28-
<server>
29-
<id>github</id>
30-
<username>YOUR_GITHUB_USERNAME</username>
31-
<password>YOUR_GITHUB_PAT</password>
32-
</server>
33-
</servers>
34-
</settings>
35-
```
36-
37-
Then build morph-models:
18+
BEAST 3 dependencies are resolved from [Maven Central](https://central.sonatype.com/namespace/io.github.compevol) — no extra configuration needed.
3819

3920
```bash
40-
cd ~/Git/morph-models
4121
mvn compile
42-
mvn test -pl beast-morph-models
22+
mvn test
4323
```
4424

45-
Alternatively, you can install BEAST 3 from source (no GitHub auth needed):
25+
To develop against an unreleased SNAPSHOT, install BEAST 3 from source:
4626

4727
```bash
4828
cd ~/Git/beast3
@@ -53,10 +33,10 @@ mvn install -DskipTests
5333

5434
```bash
5535
# Validate an XML
56-
mvn -pl beast-morph-models exec:exec -Dbeast.args="-validate examples/M3982.xml"
36+
mvn exec:exec -Dbeast.args="-validate examples/M3982.xml"
5737

5838
# Run an analysis
59-
mvn -pl beast-morph-models exec:exec -Dbeast.args="-overwrite examples/M3982.xml"
39+
mvn exec:exec -Dbeast.args="-overwrite examples/M3982.xml"
6040
```
6141

6242
## Examples
@@ -68,7 +48,7 @@ mvn -pl beast-morph-models exec:exec -Dbeast.args="-overwrite examples/M3982.xml
6848

6949
### ZIP / CBAN
7050

71-
The existing `release.sh` script builds a BEAST package ZIP and optionally
51+
The `release.sh` script builds a BEAST package ZIP and optionally
7252
creates a GitHub release for submission to [CBAN](https://github.com/CompEvol/CBAN):
7353

7454
```bash
@@ -78,23 +58,18 @@ creates a GitHub release for submission to [CBAN](https://github.com/CompEvol/CB
7858

7959
### Maven Central
8060

81-
```bash
82-
mvn clean deploy -Prelease
83-
```
84-
85-
This builds the JARs (with `version.xml` embedded for service discovery), generates
86-
sources and javadoc JARs, signs everything with GPG, and uploads to Maven Central.
61+
Pushing a `v*` tag triggers the CI workflow to publish to Maven Central.
8762

8863
BEAST 3 users can then install with:
8964

9065
```
91-
Package Manager > Install from Maven > io.github.compevol:beast-morph-models:1.3.0
66+
Package Manager > Install from Maven > io.github.compevol:morph-models:1.3.0
9267
```
9368

9469
Or from the command line:
9570

9671
```bash
97-
packagemanager -maven io.github.compevol:beast-morph-models:1.3.0
72+
packagemanager -maven io.github.compevol:morph-models:1.3.0
9873
```
9974

10075
## References

beast-morph-models-fx/pom.xml

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

beast-morph-models-fx/src/main/java/module-info.java

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

beast-morph-models/pom.xml

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

0 commit comments

Comments
 (0)