Skip to content

Commit

Permalink
Merge branch 'osscameroon:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
codeurzebs authored Oct 11, 2023
2 parents 60b0333 + 0a62bd0 commit f2b391c
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 15 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Maven Site

on:
push:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
# Given the fact that this is a multimodule project, build process will take long time so we activate caching
# To know more: https://maven.apache.org/extensions/maven-build-cache-extension/cache.html
cache: 'maven'
- name: Build Javadoc Site with Maven
#To see the full stack trace of the errors, re-run Maven with the -e switch.
#Re-run Maven using the -X switch to enable full debug logging.
# -B,--batch-mode Run in non-interactive (batch) mode (disables output color)
# To learn more about options: https://maven.apache.org/ref/3.6.3/maven-embedder/cli.html
run: |
mvn clean site -B -e -X --projects 'jsgenerator-core'
env:
MAVEN_SITE_GITHUB_OAUTH_TOKEN: ${{ secrets.MAVEN_SITE_GITHUB_OAUTH_TOKEN }}
5 changes: 1 addition & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,4 @@ jobs:
# -B,--batch-mode Run in non-interactive (batch) mode (disables output color)
# To learn more about options: https://maven.apache.org/ref/3.6.3/maven-embedder/cli.html
run: |
mvn package -B -e -X
mvn site -B -e -X --projects 'jsgenerator-core'
env:
MAVEN_SITE_GITHUB_OAUTH_TOKEN: ${{ secrets.MAVEN_SITE_GITHUB_OAUTH_TOKEN }}
mvn clean test -B -e -X
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![Contributors](https://img.shields.io/github/contributors-anon/osscameroon/js-generator)](https://github.com/osscameroon/js-generator/graphs/contributors)
![Follow](https://img.shields.io/twitter/follow/osscameroon?style=social)

# Status: UNDER DEVELOPMENT

# Table of Contents
- [About](#about)
Expand Down Expand Up @@ -117,16 +118,16 @@ mvn clean test
API Server
```shell
# After starting the server, visit http://localhost:8080
mvn --projects jsgenerator-api spring-boot:run
mvn --also-make --projects jsgenerator-api clean spring-boot:run
```

Command Line Interface (CLI)
```shell
# After reading the help, play out with different CLI options
mvn --projects jsgenerator-cli spring-boot:run -Dspring-boot.run.arguments=--help
mvn --also-make --projects jsgenerator-cli clean spring-boot:run -Dspring-boot.run.arguments=--help

# For example:
mvn --projects :jsgenerator-cli spring-boot:run \
mvn --also-make --projects :jsgenerator-cli clean spring-boot:run \
-Dspring-boot.run.arguments="--tty --inline '<div>I am a <strong>tea pot</strong></div>'"
```

Expand All @@ -148,7 +149,7 @@ Do not hesitate to open an issue on this repository and/or create a pull request

In order to create a PR, just fork first.

**[We started from the bottom 4 years ago](https://github.com/opensourcecameroon/jsGenerator), now we are here, we believe we will continue moving forward together 😊.**
**[We started from the bottom 5 years ago](https://github.com/opensourcecameroon/jsGenerator), now we are here, we believe we will continue moving forward together 😊.**

Thanks for your commitment, we really appreciate!
Happy Coding! 😊🎉💯
Expand Down
Binary file modified illustrations/intellij-maven-runner-configuration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion jsgenerator-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -30,4 +33,4 @@
<artifactId>jsgenerator-slim-api</artifactId>
</dependency>
</dependencies>
</project>
</project>
5 changes: 4 additions & 1 deletion jsgenerator-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -30,4 +33,4 @@
<artifactId>jsgenerator-slim-cli</artifactId>
</dependency>
</dependencies>
</project>
</project>
7 changes: 6 additions & 1 deletion jsgenerator-desktop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>

<dependency>
<groupId>com.osscameroon</groupId>
<artifactId>jsgenerator-core</artifactId>
Expand Down Expand Up @@ -180,4 +185,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 2 additions & 0 deletions jsgenerator-slim-api/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
roles: ACTUATOR
application:
name: jsgenerator-api
banner:
location: classpath:/banner.txt
springdoc:
api-docs:
path: /openapi.yaml
Expand Down
9 changes: 9 additions & 0 deletions jsgenerator-slim-api/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

_ _____ _____ ______ _ _ ______ _____ _______ ____ _____ _____ _____
| |/ ____|/ ____| ____| \ | | ____| __ \ /\|__ __/ __ \| __ \ /\ | __ \_ _|
| | (___ | | __| |__ | \| | |__ | |__) | / \ | | | | | | |__) |_____ / \ | |__) || |
_ | |\___ \| | |_ | __| | . ` | __| | _ / / /\ \ | | | | | | _ /______/ /\ \ | ___/ | |
| |__| |____) | |__| | |____| |\ | |____| | \ \ / ____ \| | | |__| | | \ \ / ____ \| | _| |_
\____/|_____/ \_____|______|_| \_|______|_| \_\/_/ \_\_| \____/|_| \_\ /_/ \_\_| |_____|


4 changes: 2 additions & 2 deletions jsgenerator-slim-cli/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ logging:
level:
root: error
spring:
main:
banner-mode: off
banner:
location: classpath:/banner.txt
9 changes: 9 additions & 0 deletions jsgenerator-slim-cli/src/main/resources/banner.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

_ _____ _____ ______ _ _ ______ _____ _______ ____ _____ _____ _ _____
| |/ ____|/ ____| ____| \ | | ____| __ \ /\|__ __/ __ \| __ \ / ____| | |_ _|
| | (___ | | __| |__ | \| | |__ | |__) | / \ | | | | | | |__) |_____| | | | | |
_ | |\___ \| | |_ | __| | . ` | __| | _ / / /\ \ | | | | | | _ /______| | | | | |
| |__| |____) | |__| | |____| |\ | |____| | \ \ / ____ \| | | |__| | | \ \ | |____| |____ _| |_
\____/|_____/ \_____|______|_| \_|______|_| \_\/_/ \_\_| \____/|_| \_\ \_____|______|_____|


12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
</parent>

<name>jsgenerator</name>
<description>Generates JavaScript code from HTML or Custom tags</description>

<description>Generates JavaScript from HTML</description>
<inceptionYear>2018</inceptionYear>

<url>https://github.com/osscameroon/js-generator</url>

<properties>
Expand Down Expand Up @@ -139,6 +140,13 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down

0 comments on commit f2b391c

Please sign in to comment.