From 945845ab8d8482dfff14650148194ae1ec5ccebd Mon Sep 17 00:00:00 2001 From: Jerry Combs Date: Wed, 11 Nov 2026 14:58:14 -0600 Subject: [PATCH 1/2] Libraries from Maven Central: DirXMLDev 0.70.0, Simulator 1.9.0, trace-core 1.12.0, console-auth 0.4.11 All four are on Maven Central now, so Maven fetches them: CI no longer runs bin/install-deps, and the image workflow resolves the pom's dependencies instead of downloading each jar from a release. bin/idmweb and hosted/docker/build.sh take the simulator's version from the pom (IDM_SIM_VERSION still overrides it). bin/install-deps stays, for building tags that pin pre-Central releases. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/image.yml | 30 ++++++------------------------ .github/workflows/test.yml | 2 -- bin/idmweb | 8 ++++---- docs/development.md | 20 +++++++------------- hosted/docker/build.sh | 2 +- pom.xml | 21 ++++++++++----------- 6 files changed, 28 insertions(+), 55 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 95121b7..161913d 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -1,7 +1,7 @@ # The hosted image on GHCR: ghcr.io/pointbluetechnology/dirxml-dev-web: (+ latest), amd64 + arm64. # Runs when a release is published, or by hand for a version that already has one. Everything comes -# from GitHub releases — this repo's jar and page, DirXMLDev's jar, the simulator's jar — so the image -# is reproducible from the tags alone; hosted/docker/build.sh gathers them and refuses any engine jar. +# from GitHub releases (this repo's jar and page) and Maven Central (the libraries the pom pins), so the +# image is reproducible from the tags alone; hosted/docker/build.sh gathers them and refuses any engine jar. name: image on: release: @@ -24,7 +24,7 @@ jobs: run: | VER="${{ github.event.inputs.version || github.event.release.tag_name }}"; VER="${VER#v}" CORE=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1) - SIM=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1); SIM=${SIM:-1.8.0} + SIM=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1) echo "ver=$VER" >> "$GITHUB_OUTPUT"; echo "core=$CORE" >> "$GITHUB_OUTPUT"; echo "sim=$SIM" >> "$GITHUB_OUTPUT" echo "web $VER, core $CORE, simulator $SIM" - name: This release's jar and page @@ -34,7 +34,7 @@ jobs: mkdir -p target web/dist gh release download "v${{ steps.v.outputs.ver }}" -p "dirxml-dev-web-${{ steps.v.outputs.ver }}.jar" -p "dirxml-dev-web-page-${{ steps.v.outputs.ver }}.zip" -D target unzip -q -o "target/dirxml-dev-web-page-${{ steps.v.outputs.ver }}.zip" -d web/dist - - name: DirXMLDev (its jar from the release; secrets helpers and the Terraform module from the tag) + - name: DirXMLDev (secrets helpers and the Terraform module from the tag) uses: actions/checkout@v4 with: repository: PointBlueTechnology/DirXMLDev @@ -46,26 +46,8 @@ jobs: repository: PointBlueTechnology/DirXMLSimulator ref: v${{ steps.v.outputs.sim }} path: DirXMLSimulator - - name: DirXMLDev and simulator jars - env: - GH_TOKEN: ${{ github.token }} - run: | - mkdir -p DirXMLDev/target - gh release download "v${{ steps.v.outputs.core }}" --repo PointBlueTechnology/DirXMLDev -p "dirxml-dev-${{ steps.v.outputs.core }}.jar" -D DirXMLDev/target - M=~/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/${{ steps.v.outputs.sim }}; mkdir -p "$M" - gh release download "v${{ steps.v.outputs.sim }}" --repo PointBlueTechnology/DirXMLSimulator -p "dirxml-simulator-${{ steps.v.outputs.sim }}.jar" -D "$M" - TRACE=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1) - T=~/.m2/repository/com/pointbluetech/dirxml-trace-core/$TRACE; mkdir -p "$T" - gh release download "v$TRACE" --repo PointBlueTechnology/DirXMLTraceViewer -p "dirxml-trace-core-$TRACE.jar" -D "$T" - PG=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1) - P=~/.m2/repository/org/postgresql/postgresql/$PG; mkdir -p "$P" - gh release download "v${{ steps.v.outputs.core }}" --repo PointBlueTechnology/DirXMLDev -p "postgresql-$PG.jar" -D "$P" - J=~/.m2/repository/com/novell/ldap/jldap/4.3; mkdir -p "$J" - gh release download "v${{ steps.v.outputs.core }}" --repo PointBlueTechnology/DirXMLDev -p "jldap-4.3.jar" -D "$J" - AUTH=$(sed -n 's#.*\([^<]*\).*#\1#p' pom.xml | head -1) - A=~/.m2/repository/com/pointbluetech/console/console-auth/$AUTH; mkdir -p "$A" - # Directory Console's console-auth library, from its (public) release - gh release download "v$AUTH" --repo PointBlueTechnology/directory-console -p "console-auth-$AUTH.jar" -D "$A" + - name: The libraries the pom names (dirxml-dev, simulator, trace-core, console-auth, JLDAP, PostgreSQL), from Maven Central + run: mvn -B -q dependency:resolve - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: docker/login-action@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b40b2e1..d137bd1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,6 @@ jobs: distribution: temurin java-version: "21" cache: maven - - name: DirXMLDev, simulator, trace parser and console-auth from their releases - run: bin/install-deps - run: mvn -B test page: runs-on: ubuntu-latest diff --git a/bin/idmweb b/bin/idmweb index 11098a4..1de97c1 100755 --- a/bin/idmweb +++ b/bin/idmweb @@ -14,7 +14,7 @@ if [ ! -d "$HERE/target/classes" ]; then echo "ERROR: this server is not built. Run 'mvn -o package' in $HERE (after 'mvn -o install -DskipTests' in DirXMLDev)." >&2 exit 1 fi -SIM_VER=${IDM_SIM_VERSION:-1.8.0} +SIM_VER=${IDM_SIM_VERSION:-$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1)} SIM_JAR="$HOME/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/$SIM_VER/dirxml-simulator-$SIM_VER.jar" # the DirXML Trace Viewer's library (the version the pom names); jldap itself comes from the engine's ldap.jar TRACE_VER=$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1) @@ -22,7 +22,7 @@ TRACE_JAR="$HOME/.m2/repository/com/pointbluetech/dirxml-trace-core/$TRACE_VER/d # the PostgreSQL JDBC driver for the event store (the version the pom names; mvn package fetches it) PG_VER=$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1) PG_JAR="$HOME/.m2/repository/org/postgresql/postgresql/$PG_VER/postgresql-$PG_VER.jar" -# Directory Console's console-auth (OIDC sign-in, TLS trust; the version the pom names; `mvn install` in directory-console) +# Directory Console's console-auth (OIDC sign-in, TLS trust; the version the pom names, from Maven Central) AUTH_VER=$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1) AUTH_JAR="$HOME/.m2/repository/com/pointbluetech/console/console-auth/$AUTH_VER/console-auth-$AUTH_VER.jar" JH=${IDM_JAVA_HOME:-} @@ -37,10 +37,10 @@ fi CP="$HERE/target/classes:$IDM_HOME/target/classes" [ -f "$SIM_JAR" ] && CP="$CP:$SIM_JAR" [ -f "$PG_JAR" ] && CP="$CP:$PG_JAR" -if [ -f "$AUTH_JAR" ]; then CP="$CP:$AUTH_JAR"; else echo "ERROR: $AUTH_JAR not found. Install it with bin/install-deps (see docs/development.md)." >&2; exit 1; fi +if [ -f "$AUTH_JAR" ]; then CP="$CP:$AUTH_JAR"; else echo "ERROR: $AUTH_JAR not found. Run mvn package here: Maven fetches it (see docs/development.md)." >&2; exit 1; fi JLDAP_JAR="$HOME/.m2/repository/com/novell/ldap/jldap/4.3/jldap-4.3.jar" # the vault path's LDAP client (open source) [ -f "$JLDAP_JAR" ] && CP="$CP:$JLDAP_JAR" -if [ -f "$TRACE_JAR" ]; then CP="$CP:$TRACE_JAR"; else echo "WARNING: $TRACE_JAR not found; live trace will fail. Install it with bin/install-deps (see docs/development.md)." >&2; fi +if [ -f "$TRACE_JAR" ]; then CP="$CP:$TRACE_JAR"; else echo "WARNING: $TRACE_JAR not found; live trace will fail. Run mvn package here: Maven fetches it (see docs/development.md)." >&2; fi for j in "$IDM_HOME"/lib/*.jar; do [ -f "$j" ] && CP="$CP:$j" done diff --git a/docs/development.md b/docs/development.md index b209565..1fb362d 100644 --- a/docs/development.md +++ b/docs/development.md @@ -14,18 +14,12 @@ runs on that checkout's own classes, so check out the tag `pom.xml` names there (`dirxmldev.version`; for example `git checkout v0.69.0`): its default branch can be ahead. ```bash -# once, in this checkout: the libraries this pom pins (dirxml-dev, the simulator, console-auth, -# the trace parser), from their GitHub releases into ~/.m2 -bin/install-deps -``` - -```bash -# once, in the DirXMLDev checkout: its classes (the trace parser it needs is now in ~/.m2) +# once, in the DirXMLDev checkout: its classes mvn package -DskipTests ``` ```bash -# the server and the page +# the server and the page; Maven fetches the libraries this pom pins mvn package ``` @@ -38,11 +32,11 @@ cd web && npm ci && npm run build bin/idmweb serve /path/to/tree ``` -None of those libraries is on Maven Central; `bin/install-deps` takes each from its repository's -GitHub release at the pinned version. A version already in `~/.m2` is left alone, so a jar you built -yourself (`mvn install` in that checkout, at the tag the pin names) is kept; `--list` shows each pin -and whether it is installed, `--force` replaces one with the release jar. DirXMLDev carries the same -script. The order of the repositories, and building one yourself, is in DirXMLDev's +The libraries this pom pins (dirxml-dev, the simulator, console-auth, the trace parser) are on +Maven Central under `com.pointbluetech`, so Maven fetches them into `~/.m2`. Versions from before +Maven Central are only on GitHub releases: to build an older tag of this repository, run +`bin/install-deps` first, which installs them into `~/.m2` (`--list` shows each pin and whether it +is installed). DirXMLDev carries the same script. The order of the repositories, and building one yourself, is in DirXMLDev's [docs/install.md §2.0](https://github.com/PointBlueTechnology/DirXMLDev/blob/master/docs/install.md#20-which-repositories-in-which-order). The launcher puts the simulator, the trace parser and `console-auth` from `~/.m2` on the class path, diff --git a/hosted/docker/build.sh b/hosted/docker/build.sh index 7780e7b..b30e68c 100755 --- a/hosted/docker/build.sh +++ b/hosted/docker/build.sh @@ -25,7 +25,7 @@ else cp "$HOME/.m2/repository/com/pointbluetech/dirxml/dirxml-dev/$CORE_VER/dirxml-dev-$CORE_VER.jar" "$CTX/artifacts/dirxml-dev.jar" fi echo "web $WEB_VER, core $CORE_VER" -SIM_VER=${IDM_SIM_VERSION:-1.8.0} +SIM_VER=${IDM_SIM_VERSION:-$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1)} cp "$HOME/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/$SIM_VER/dirxml-simulator-$SIM_VER.jar" "$CTX/artifacts/dirxml-simulator.jar" TRACE_VER=$(sed -n 's#.*\([^<]*\).*#\1#p' "$HERE/pom.xml" | head -1) cp "$HOME/.m2/repository/com/pointbluetech/dirxml-trace-core/$TRACE_VER/dirxml-trace-core-$TRACE_VER.jar" "$CTX/artifacts/dirxml-trace-core.jar" diff --git a/pom.xml b/pom.xml index c4818c5..3d78207 100644 --- a/pom.xml +++ b/pom.xml @@ -20,16 +20,15 @@ 21 UTF-8 - - 0.69.0 - 1.8.0 + + 0.70.0 + 1.9.0 - - 0.1.0 - 1.10.0 + + 0.4.11 + 1.12.0 42.7.7 @@ -61,8 +60,8 @@ - + com.pointbluetech.dirxml dirxml-simulator From d8b85ce4542f3a04bdb81efccbd2c10678744ecb Mon Sep 17 00:00:00 2001 From: Jerry Combs Date: Wed, 11 Nov 2026 16:15:18 -0600 Subject: [PATCH 2/2] CHANGELOG: libraries from Maven Central Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56899d8..98285c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,14 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html) ### Changed -- **Maven coordinates move to `com.pointbluetech` for Maven Central:** the web depends on - `com.pointbluetech.dirxml:dirxml-dev`, `com.pointbluetech.dirxml:dirxml-simulator` and - `com.pointbluetech.console:console-auth`, as those projects move. `bin/idmweb`, `hosted/docker/build.sh` - and the image workflow look for them under `~/.m2/repository/com/pointbluetech/`. **After updating, run - `bin/install-deps`**: it installs the pinned versions under the new groupIds. -- `bin/install-deps` (the same as DirXMLDev's) takes each groupId from the pom and skips a version on - Maven Central. +- **The libraries come from Maven Central:** needs DirXMLDev 0.70.0 (was 0.69.0), DirXMLSimulator 1.9.0 + (was 1.8.0), the trace parser 1.12.0 (was 1.10.0) and `console-auth` 0.4.11 (was 0.1.0), all on Maven + Central under `com.pointbluetech`, so Maven fetches them: a build from source needs no install step, CI + no longer runs `bin/install-deps`, and the image workflow resolves the pom instead of downloading each jar + from a release. `bin/install-deps` (the same as DirXMLDev's, now taking each groupId from the pom) stays + for building older tags. Nothing changes on the page. +- `bin/idmweb` and `hosted/docker/build.sh` take the simulator's version from the pom (`IDM_SIM_VERSION` + still overrides it). ## [0.90.0] - 2026-11-11