Skip to content

Commit

Permalink
Merge pull request #140 from tsegismont/cli_cleanup
Browse files Browse the repository at this point in the history
CLI Cleanup
  • Loading branch information
tsegismont authored Aug 1, 2023
2 parents af0aaed + f8b9213 commit 4089e4c
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 1,702 deletions.
17 changes: 0 additions & 17 deletions .travis.maven.settings.xml

This file was deleted.

7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ Therefore it should be used with explicit dependencies:
2. Add it to `stack-depchain/pom.xml` (open the project, add the dependency, without the version (inherited from
vertx-dependencies))
3. Add it in the stack manager:
* Open `./stack-manager/src/main/descriptor/vertx-stack.json`
* Add the dependency. If the dependency must be embedded in the _min_ distribution, set `included` to `true`. So forget to use the `\${version}`.
* Open `./stack-manager/src/main/descriptor/vertx-stack-full.json`
* Add the dependency. If the dependency must be embedded in the _full_ distribution, set `included` to `true`. So forget to use the `\${version}`.
* Add the dependency. If the dependency must be embedded in the _full_ distribution, set `included` to `true`. Don't forget to use the `\${version}`.
4. Add it to the doc distribution:
* Open `./stack-docs/pom.xml`
* Add the `docs` dependency (the using `<classifier>docs</classifier>` and `<type>zip</type>`)
Expand Down Expand Up @@ -97,6 +95,3 @@ vertx-dependencies))
* Edit the stack definition file `src/main/resources/starter.json`
* Add the module details in one of the categories (web, data, ...etc)
* Exclude the module from versions that did not have it (`exclusions`)



8 changes: 8 additions & 0 deletions stack-depchain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-legacy-cli</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-application</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-groovy</artifactId>
Expand Down
44 changes: 24 additions & 20 deletions stack-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,27 @@
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-legacy-cli</artifactId>
<version>${vertx.docs.version}</version>
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-application</artifactId>
<version>${vertx.docs.version}</version>
<classifier>docs</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-application</artifactId>
<version>${vertx.docs.version}</version>
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-groovy</artifactId>
Expand Down Expand Up @@ -1118,20 +1139,6 @@
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-stack-manager</artifactId>
<version>${vertx.docs.version}</version>
<classifier>docs</classifier>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-stack-manager</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-service-discovery</artifactId>
Expand Down Expand Up @@ -1644,6 +1651,9 @@
<copy todir="${project.build.directory}/docs/vertx-core/">
<fileset dir="${project.build.directory}/work/vertx-core-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-launcher-application/">
<fileset dir="${project.build.directory}/work/vertx-launcher-application-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-unit/">
<fileset dir="${project.build.directory}/work/vertx-unit-docs-zip"/>
</copy>
Expand Down Expand Up @@ -1769,9 +1779,6 @@
<copy todir="${project.build.directory}/docs/vertx-sockjs-service-proxy/">
<fileset dir="${project.build.directory}/work/vertx-sockjs-service-proxy-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-docker/">
<fileset dir="${project.build.directory}/work/vertx-stack-docker-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-hazelcast/">
<fileset dir="${project.build.directory}/work/vertx-hazelcast-docs-zip"/>
</copy>
Expand Down Expand Up @@ -1829,9 +1836,6 @@
<copy todir="${project.build.directory}/docs/vertx-micrometer-metrics/">
<fileset dir="${project.build.directory}/work/vertx-micrometer-metrics-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-stack-manager/">
<fileset dir="${project.build.directory}/work/vertx-stack-manager-docs-zip"/>
</copy>
<copy todir="${project.build.directory}/docs/vertx-circuit-breaker/">
<fileset dir="${project.build.directory}/work/vertx-circuit-breaker-docs-zip"/>
</copy>
Expand Down
3 changes: 1 addition & 2 deletions stack-docs/src/main/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
=== Java

- link:vertx-core/java/index.html[Core]
- link:vertx-launcher-application/java/index.html[Application Launcher]
- link:vertx-web/java/index.html[Web]
- link:vertx-web-client/java/index.html[Web client]
- link:vertx-web-api-contract/java/index.html[Web API contracts]
Expand Down Expand Up @@ -47,8 +48,6 @@
- link:vertx-opentelemetry/java/index.html[Opentelemetry]
- link:vertx-health-check/java/index.html[Health check]
- link:vertx-shell/java/index.html[Shell]
- link:vertx-docker/index.html[Docker]
- link:vertx-stack-manager/stack-manager/index.html[Stack manager]
- link:vertx-unit/java/index.html[Vert.x unit]
- link:vertx-junit5/java/index.html[Vert.x JUnit 5]
- link:vertx-hazelcast/java/index.html[Hazelcast]
Expand Down
193 changes: 4 additions & 189 deletions stack-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-launcher-legacy-cli</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -172,203 +176,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<id>build-minimal-stack</id>
<phase>prepare-package</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>io.vertx.core.Launcher</mainClass>
<arguments>
<argument>resolve</argument>
<argument>${project.basedir}/target/vertx-stack/vertx-stack.json</argument>
<argument>--dir=${project.basedir}/target/min-lib</argument>
<argument>--no-cache</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>build-full-stack</id>
<phase>prepare-package</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>io.vertx.core.Launcher</mainClass>
<arguments>
<argument>resolve</argument>
<argument>${project.basedir}/target/vertx-stack/vertx-stack-full.json</argument>
<argument>--dir=${project.basedir}/target/full-lib</argument>
<argument>--no-cache</argument>
</arguments>
</configuration>
</execution>
<!--
<execution>
<id>build-scala-stack</id>
<phase>prepare-package</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>io.vertx.core.Launcher</mainClass>
<arguments>
<argument>resolve</argument>
<argument>${project.basedir}/target/vertx-stack/vertx-stack-scala.json</argument>
<argument>&#45;&#45;dir=${project.basedir}/target/scala-lib</argument>
<argument>&#45;&#45;no-cache</argument>
</arguments>
</configuration>
</execution>
-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<excludes>
<exclude>io.vertx:vertx-core</exclude>
<exclude>io.vertx:vertx-docgen</exclude>
<exclude>io.netty:*</exclude>
<exclude>com.fasterxml.jackson.core:*</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>shaded.org.apache</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse.aether</pattern>
<shadedPattern>shaded.org.eclipse.aether</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>shaded.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.plexus</pattern>
<shadedPattern>shaded.org.codehaus.plexus</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>shaded.org.slf4j</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>vertx-stack</id>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${finalName}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/stack.xml</descriptor>
</descriptors>
</configuration>
<phase>package</phase>
</execution>

<execution>
<id>vertx-stack-full</id>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${finalName}</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/stack-full.xml</descriptor>
</descriptors>
</configuration>
<phase>package</phase>
</execution>

<!--
<execution>
<id>vertx-stack-scala</id>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${finalName}</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/stack-scala.xml</descriptor>
</descriptors>
</configuration>
<phase>package</phase>
</execution>
-->

<execution>
<id>doc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>true</attach>
<descriptors>
<descriptor>${basedir}/src/main/assembly/docs.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<target>1.8</target>
<source>1.8</source>
<annotationProcessors>
<annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
</annotationProcessors>
<generatedSourcesDirectory>${project.basedir}/src/main/generated</generatedSourcesDirectory>
<compilerArgs>
<arg>-Adocgen.output=${asciidoc.dir}/stack-manager</arg>
<arg>-AoutputDirectory=${project.basedir}/src/main</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>process-asciidoc</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
Loading

0 comments on commit 4089e4c

Please sign in to comment.