Skip to content

Commit 2b7fa36

Browse files
committed
Merge branch 'release/1.2.0'
2 parents a68faa3 + 7011367 commit 2b7fa36

File tree

211 files changed

+4644
-5070
lines changed

Some content is hidden

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

211 files changed

+4644
-5070
lines changed

.github/workflows/ci-snapshot.yml

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

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ jobs:
3030
restore-keys: ${{ runner.os }}-m2
3131
- name: Build PlantUML lib update site
3232
run: ./gradlew clean buildPlantUmlLibUpdateSite --no-daemon
33-
# TODO activate the following, as soon as we have an Eclipse update site with the PlantUML lib
34-
#- name: Verify PlantUML4Eclipse
35-
# run: mvn --batch-mode --update-snapshots clean verify -f plantuml4eclipse/releng/net.sourceforge.plantuml.aggregator/pom.xml
33+
- name: Build and test PlantUML4Eclipse
34+
run: ./gradlew clean buildPlantUml4EUpdateSite --no-daemon

.github/workflows/release-plantuml-lib.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
commit: ${{ github.event.client_payload.commit }}"
2727
2828
build:
29-
# igrnore PlantUML snapshot releases (pre-releases), read snapshot flag from repository_dispatch event's payload
29+
# ignore PlantUML snapshot releases (pre-releases), read snapshot flag from repository_dispatch event's payload
3030
if: github.event.client_payload.snapshot == 'false'
3131
runs-on: ubuntu-latest
3232
outputs:
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
export PLANTUML_VERSION=$(./gradlew -q printPlantUmlLibVersion)
5151
echo "plantuml_version=$PLANTUML_VERSION" >> $GITHUB_OUTPUT
52-
./gradlew updateGhPagesContents --no-daemon
52+
./gradlew updateGhPagesContentsAddLatestPlantUmlLib --no-daemon
5353
5454
- name: Save artifacts for the git push
5555
uses: actions/upload-artifact@v4

README.md

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# PlantUML - generate UML diagrams from files and view them in Eclipse
1+
<!-- see https://shields.io/badges -->
2+
3+
![GitHub License](https://img.shields.io/github/license/plantuml/plantuml-eclipse)
4+
[![PlantUML library release for Eclipse](https://github.com/plantuml/plantuml-eclipse/actions/workflows/release-plantuml-lib.yml/badge.svg?branch=main)](https://github.com/plantuml/plantuml-eclipse/actions/workflows/release-plantuml-lib.yml)
5+
[![PlantUML4Eclipse CI](https://github.com/plantuml/plantuml-eclipse/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/plantuml/plantuml-eclipse/actions/workflows/ci.yml)
6+
7+
# PlantUML - Generate UML diagrams from files and view them in Eclipse
28

39
The plantuml library implements a DSL and renderer for many UML diagrams (class, sequence, objects, states, activities, ...).
410
See http://plantuml.com for more info about the DSL and renderer.
@@ -18,10 +24,12 @@ Diagram generation is handled by (implementations of) an extension point, called
1824

1925
Each diagram intent provider may support properties that affect details of how diagrams are generated, that may be changed pr. workspace by adding properties in a specific **properties** file in a specific folder. The folder is settable in the PlantUML property sheet. E.g. the diagram intent provider for class diagrams supports two properties, that controls how attributes' name and type are rendered. Certain other behavior is also controlled by properties in **properties** files, details can be found in Customization.
2026

27+
2128
# License
2229

2330
This repo uses the [EPL license vers. 1.0](plantuml4eclipse/features/net.sourceforge.plantuml.feature/epl-v10.html).
2431

32+
2533
# Community
2634

2735
We use [Issues](https://github.com/plantuml/plantuml-eclipse/issues) for issue tracking,
@@ -33,37 +41,72 @@ Of course, you can also ask questions about how to use PlantUML, tell us about h
3341

3442
*Originally, this repository was created and hosted by [Hallvard Trætteberg](https://github.com/hallvard). You'll find previous issues and discussions in the [original repository](https://github.com/hallvard/plantuml).*
3543

44+
3645
# Installation
3746

38-
We use github pages at [https://plantuml.github.io/plantuml-eclipse/](https://plantuml.github.io/plantuml-eclipse/) as the update site URL.
47+
We use GitHub pages at [https://plantuml.github.io/plantuml-eclipse/](https://plantuml.github.io/plantuml-eclipse/) as the update site URL.
3948
Just install the plug-ins in Eclipse via the Help > Install New Software... dialog using that URL.
49+
Previous versions can be installed using the update site [https://hallvard.github.io/plantuml/](https://hallvard.github.io/plantuml/).
50+
51+
Beginning with version 1.2.0, you'll need at least the following features
52+
- *PlantUML Feature* (the PlantUML diagramming support for Eclipse)
53+
- *PlantUML Library Feature* (the PlantUML library needed for rendering diagrams, it inlcudes the ELK layouting library)
54+
55+
The following features are optional
56+
- *PlantUML Ecore Feature* (for drawing class diagrams from ecore files)
57+
- *PlantUML UML2 Feature* (for drawing UML diagrams from UML 2 model files)
58+
4059

4160
# For developers / contributors
4261

4362
You'll find some developer documentation here:
44-
- net.sourceforge.plantuml.composite/README.md (how to build, run, and release)
45-
- net.sourceforge.plantuml.lib/README.md (how to update PlantUML library)
63+
- plantuml4eclipse/releng/net.sourceforge.plantuml.parent/README.md (how to build, run, and release)
64+
- plantuml4eclipse/releng/net.sourceforge.plantuml.parent/Customization.md (how to adapt diagrams)
65+
66+
The PlantUML4Eclipse plug-ins depend on the PlantUML library bundle, i.e. net.sourceforge.plantuml.library.
67+
This bundle is automatically built and published on an Eclipse update site
68+
(this repo's GitHub pages publish a composite update site with PlantUML library and PlantUML4Eclipse plug-ins)
69+
as soon as there is a new PlantUML release (see GitHub workflows).
70+
The net.sourceforge.plantuml.library bundle uses the EPL-licensed version of the PlantUML library.
71+
4672

4773
# Main plugins (net.sourceforge.plantuml.)
48-
- lib - plantuml.jar packaged as a bundle
49-
- lib.jlatexmath - fragment to the lib bundle that adds the jlatexmath lib
50-
- lib.elk - fragment to the lib bundle that adds the ELK layout engine lib
5174
- eclipse - core Eclipse integration, including the extension point for providing diagrams
5275
- eclipse.imagecontrol - the control for viewing the generated images
5376
- svg - the browser-based svg view
5477
- text - diagrams based on explicit DSL code, with support for editors based on the standard Eclipse text editor
5578
- jdt - diagrams based on the Eclipse Java model, with support for Java and Class File editors
5679
- ecore - diagrams based on Ecore models, with support for most Ecore editors
80+
- uml2 - diagrams based on UML2 models
5781
- osgi - component diagrams based on OSGi meta-data
5882
- (xcore - diagrams based on Xcore models, with support for the Xtext editor)
59-
- (uml2 - diagrams based on UML2 models, *obsolete*)
6083

61-
# Releases
62-
63-
Notable features in recent releases, details are found in [releases](https://github.com/hallvard/plantuml/releases).
64-
Note that the version numbers of the plantuml.lib plugin are a bit special, since they use the version of the included plantuml.jar
6584

85+
# Releases
6686

87+
Notable features in recent releases are listed below.
88+
You'll find all versions in the [releases](https://github.com/plantuml/plantuml-eclipse/releases) section.
89+
(Previously, [releases were published by Hallvard Trætteberg](https://github.com/hallvard/plantuml/releases)).
90+
91+
Note that the net.sourceforge.plantuml.library plugin's versions are similar to those of the included PlantUML library release versions.
92+
This plugin's life cycle is strictly coupled with that of the PlantUML library releases.
93+
94+
95+
## [1.2.0](https://github.com/plantuml/plantuml-eclipse/releases/tag/1.2.0)
96+
- Move git repository from https://github.com/hallvard/plantuml to https://github.com/plantuml/plantuml-eclipse
97+
(see discussions [1](https://github.com/hallvard/plantuml/discussions/166) and [2](https://github.com/plantuml/plantuml-eclipse/discussions/2))
98+
- Separate releases for PlantUML library plug-in (PlantUML lib) and PlantUML support for Eclipse plug-ins (PlantUML4Eclipse).
99+
This way, we make the PlantUML library (EPL-licensed) easily re-usable in any Eclipse plug-in (just add a dependency and install it via update site).
100+
([issue #145](https://github.com/hallvard/plantuml/issues/145))
101+
- Automate PlantUML library plug-in releases (create new PlantUML library plug-in for Eclipse as soon as a PlantUML library is released)
102+
([issue #145](https://github.com/hallvard/plantuml/issues/145))
103+
- Semi-automate PlantUML for Eclipse plug-in releases
104+
([issue #145](https://github.com/hallvard/plantuml/issues/145))
105+
- Update dependency to PlantUML library version 1.2025.10 (see [changes](https://plantuml.com/changes))
106+
and remove some obsolete plug-ins since we no longer need ELK library (it is now included in the PlantUML library).
107+
- Improve saving a diagram as an SVG file, suggest the same folder for the new .svg file as the original .puml file.
108+
- Add UML 2 model support (rendering various diagrams from UML 2 models), original plug-ins implemented by [@hallvard](https://github.com/hallvard) were updated and extended.
109+
Thanks for the [PR](https://github.com/hallvard/plantuml/pull/187) to [@ansgarradermacher](https://github.com/ansgarradermacher).
67110

68111
## [1.1.32](https://github.com/hallvard/plantuml/releases/tag/1.1.32)
69112
- Updated PlantUML library version to 1.2024.5, see [changes](https://plantuml.com/changes).

0 commit comments

Comments
 (0)