Skip to content

Commit

Permalink
Project refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
fugerit79 committed Sep 18, 2023
1 parent bff935c commit 871947a
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 15 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/sonarcloud-maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Sonar Cloud Maven Build
on:
# Trigger analysis when pushing in master or pull requests, and when creating
# a pull request.
push:
branches:
- main
- branch-sonarcloud
pull_request:
types:
- opened
- synchronize
- reopened

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# Shallow clones should be disabled for a better relevancy of analysis
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'corretto'
cache: 'maven'
- name: Cache Maven packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Maven version
run: mvn -v
env:
# Needed to get some information about the pull request, if any
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: Build and analyze
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage -Pcoverage,sonarfugerit -Dsonar.projectKey=fugerit-org_${{github.event.repository.name}}
env:
# Needed to get some information about the pull request, if any
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
17 changes: 10 additions & 7 deletions fj-doc-guides-A001-hello-world-pdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-doc</artifactId>
<version>1.4.4</version>
<relativePath></relativePath>
<groupId>org.fugerit.java.guide</groupId>
<artifactId>fj-doc-guides</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>

<groupId>org.fugerit.java.guides</groupId>
<artifactId>fj-doc-guides-A001-hello-world-pdf</artifactId>
<version>0.1.0-rc.3</version>

<name>fj-doc-guides-A001-hello-world-pdf</name>
<description>Fugerit Doc Venus rendered for PDF based on PDFBOX</description>
Expand All @@ -32,7 +29,6 @@

<properties>
<maven.compiler.release>11</maven.compiler.release>
<fj-doc-version>${project.parent.version}</fj-doc-version>
</properties>

<developers>
Expand Down Expand Up @@ -65,8 +61,15 @@
<dependency>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-doc-mod-fop</artifactId>
<version>${fj-doc-version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<organization>
Expand Down
20 changes: 12 additions & 8 deletions fj-doc-guides-E001-hello-world-pdf-json-source/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-doc</artifactId>
<version>1.4.4</version>
<relativePath></relativePath>
<groupId>org.fugerit.java.guide</groupId>
<artifactId>fj-doc-guides</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>

<groupId>org.fugerit.java.guides</groupId>
<artifactId>fj-doc-guides-E001-hello-world-pdf-json-source</artifactId>
<version>0.1.0-rc.3</version>


<name>fj-doc-guides-E001-hello-world-pdf-json-source</name>
<description>Fugerit Doc Venus rendered for PDF based on PDFBOX</description>

Expand All @@ -32,7 +29,6 @@

<properties>
<maven.compiler.release>11</maven.compiler.release>
<fj-doc-version>${project.parent.version}</fj-doc-version>
</properties>

<developers>
Expand Down Expand Up @@ -65,14 +61,22 @@
<dependency>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-doc-base-json</artifactId>
<version>${fj-doc-version}</version>
</dependency>

<!-- module for rendering pdf using Apache FOP -->
<dependency>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-doc-mod-fop</artifactId>
<version>${fj-doc-version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<organization>
Expand Down
44 changes: 44 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.fugerit.java.guide</groupId>
<artifactId>fj-doc-guides</artifactId>

<parent>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-bom</artifactId>
<version>1.4.0</version>
<relativePath></relativePath>
</parent>

<name>Fugerit Venus Guides</name>
<description>Collections of guides for Fugerit Venus Document generation</description>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<properties>
<fj-doc-version>3.0.4</fj-doc-version>
</properties>

<modules>
<module>fj-doc-guides-A001-hello-world-pdf</module>
<module>fj-doc-guides-E001-hello-world-pdf-json-source</module>
</modules>

<organization>
<url>https://www.fugerit.org</url>
<name>Fugerit</name>
</organization>

<url>https://www.fugerit.org/perm/venus/</url>

</project>

0 comments on commit 871947a

Please sign in to comment.