diff --git a/.gitignore b/.gitignore index 992bcd6e0..d0bab4e54 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ out/ .java-version .factorypath + +/*.svg diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml index 074888ec9..c51dbaa4c 100644 --- a/maven-script/maven-plugin-tools-ant/pom.xml +++ b/maven-script/maven-plugin-tools-ant/pom.xml @@ -28,7 +28,7 @@ maven-plugin-tools-ant - Maven Plugin Tool for Ant + Maven Plugin Tool for Ant (deprecated) Descriptor extractor for plugins written in Ant. diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml index 6878708c8..3fb5ff1e2 100644 --- a/maven-script/maven-plugin-tools-beanshell/pom.xml +++ b/maven-script/maven-plugin-tools-beanshell/pom.xml @@ -28,7 +28,7 @@ maven-plugin-tools-beanshell - Maven Plugin Tool for Beanshell + Maven Plugin Tool for Beanshell (deprecated) Descriptor extractor for plugins written in Beanshell. diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index bb6165653..265423082 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -28,7 +28,7 @@ maven-plugin-tools-model - Maven Plugin Metadata Model + Maven Plugin Metadata Model (deprecated) The Maven Plugin Metadata Model provides an API to play with the Metadata model. diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml index beb9b5a58..151183bc4 100644 --- a/maven-script/maven-script-ant/pom.xml +++ b/maven-script/maven-script-ant/pom.xml @@ -28,7 +28,7 @@ under the License. maven-script-ant - Maven Ant Mojo Support + Maven Ant Mojo Support (deprecated) Maven Ant Mojo Support, ie write Maven plugins with Ant scripts. diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml index 659f9de53..b7e64b952 100644 --- a/maven-script/maven-script-beanshell/pom.xml +++ b/maven-script/maven-script-beanshell/pom.xml @@ -28,7 +28,7 @@ under the License. maven-script-beanshell - Maven Beanshell Mojo Support + Maven Beanshell Mojo Support (deprecated) Maven Beanshell Mojo Support, ie write Maven plugins with Beanshell scripts. diff --git a/maven-script/pom.xml b/maven-script/pom.xml index 8884dc6e8..b868f6f16 100644 --- a/maven-script/pom.xml +++ b/maven-script/pom.xml @@ -29,7 +29,7 @@ under the License. maven-script pom - Maven Script Mojo Support + Maven Script Mojo Support (deprecated) Maven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java. Scripting support is deprecated, with Maven 4 only Java based Mojos will be supported. diff --git a/pom.xml b/pom.xml index 1650f7dfd..54a0e83ef 100644 --- a/pom.xml +++ b/pom.xml @@ -342,7 +342,8 @@ apache-rat-plugin - src/site/resources/images/plugin-descriptors.svg + src/site/resources/images/*.svg + *.svg src/site/xdoc/plugin-descriptors.mmd diff --git a/prepare-svg.sh b/prepare-svg.sh new file mode 100755 index 000000000..5af16d078 --- /dev/null +++ b/prepare-svg.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +#libreoffice --headless --convert-to svg src/xdoc/plugin-tools-deps.odg +# CLI export keeps full A3 page +# I prefer doing it by hand, limiting export to "selection" = avoids extra space + +# svgo https://github.com/svg/svgo +svgo --config svgo.config.mjs plugin-tools-deps.svg -o plugin-tools-deps-optimized.svg + +cat plugin-tools-deps-optimized.svg \ + | sed 's/a xlink:href/a target="_parent" xlink:href/' \ + | sed 's_file://_.._' \ + > src/site/resources/images/plugin-tools-deps.svg diff --git a/src/site/resources/images/plugin-tools-deps.png b/src/site/resources/images/plugin-tools-deps.png deleted file mode 100644 index 0da46f962..000000000 Binary files a/src/site/resources/images/plugin-tools-deps.png and /dev/null differ diff --git a/src/site/resources/images/plugin-tools-deps.svg b/src/site/resources/images/plugin-tools-deps.svg new file mode 100644 index 000000000..d0c2747cc --- /dev/null +++ b/src/site/resources/images/plugin-tools-deps.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + plugin-tools-java + + + + + + + + plugin-tools-generators + + + + + + + + maven-plugin-plugin + + + + + + + + Doxia + + + + + + + + plugin-tools-api + + + + + + + + + + + + + + + + + + maven-plugin-api + + + + + + + + qdox + + + + + + + + plugin-tools-annotations + + + + + + + + plugin-annotations + + + + + + + + + + + + + + + + + + asm + + + + + + + + + + + + + + + + + + + + + + + maven-plugin-report-plugin + + + + + + + + maven-reporting-api + + + + + + + + + + + + + + + + + + maven-script (deprecated) + + + + diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index e62096ae9..dd1dd0328 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -37,28 +37,8 @@ help, and documentation.

- - - maven-plugin-plugin - plugin-tools-api - plugin-tools-javadoc - plugin-tools-java - plugin-annotations - plugin-tools-annotations - plugin-tools-beanshell - maven-script-beanshell - plugin-tools-ant - maven-script-ant - plugin-tools-model - plugin-tools-generators - maven-script - maven-plugin-api - qdox - asm - Doxia - Beanshell - Ant - + +

@@ -83,10 +63,6 @@ - - - - @@ -96,28 +72,9 @@ - - - - - - - - - - - - - - - - - - - - - - + +
  maven-plugin-tools-java Extractor for plugins written in Java annotated with Mojo Javadoc Tags.
    maven-plugin-tools-javadocProvides doclets to support Mojo Javadoc Tags in the Javadoc Tool.
  maven-plugin-tools-annotations Extractor for plugins written in Java with Java annotations.Provides the Java annotations to use in Mojos.
maven-scriptMaven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java.
  maven-plugin-tools-beanshellExtractor for plugins written in Beanshell.
  maven-script-beanshellMaven Beanshell Mojo Support, ie write Maven plugins with Beanshell scripts.
  maven-plugin-tools-antExtractor for plugins written in Ant.
  maven-script-antMaven Ant Mojo Support, ie write Maven plugins with Ant script.
  maven-plugin-tools-modelPlugin Metadata Model for script-based plugins.maven-script (deprecated)Maven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java.
+ Deprecated since 3.7.0
diff --git a/src/site/xdoc/plugin-tools-deps.odg b/src/site/xdoc/plugin-tools-deps.odg index 9d6bf478d..549f9a36d 100644 Binary files a/src/site/xdoc/plugin-tools-deps.odg and b/src/site/xdoc/plugin-tools-deps.odg differ diff --git a/svgo.config.mjs b/svgo.config.mjs new file mode 100644 index 000000000..84b3da2ed --- /dev/null +++ b/svgo.config.mjs @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export default { + js2svg: { + indent: 1, + pretty: true, + }, + plugins: [ + 'preset-default', + { + name: "removeAttrs", + params: { + attrs: [ + "g:class", + "path:class", + ] + } + }, + ], + };