Skip to content

Commit

Permalink
Merge pull request #8 from Bernardo-MG/release
Browse files Browse the repository at this point in the history 
Release
  • Loading branch information
@Bernardo-MG
Bernardo-MG authored Sep 1, 2022
2 parents c3ed504 + bc22b72 commit eca0b20
Show file tree
Hide file tree
Showing 22 changed files with 350 additions and 627 deletions.
46 changes: 0 additions & 46 deletions .github/workflows/deploy_docs.yml
View file

This file was deleted.

12 changes: 12 additions & 0 deletions .github/workflows/deployment.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Artifact deployment

on:
release:
types: [created]

jobs:
github:
name: Github
uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_github.yml@v1
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Tests and docs

on: [push, pull_request]

jobs:
tests:
name: Tests
uses: Bernardo-MG/github-workflow/.github/workflows/maven_testing.yml@v1

deploy_develop_docs:
name: Deploy development docs
needs: tests
uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1
with:
branch: develop
host: docs.bernardomg.com
secrets:
url: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }}
username: ${{ secrets.DEPLOY_DOCS_DEVELOP_USER }}
password: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }}

deploy_docs:
name: Deploy docs
needs: tests
uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1
with:
branch: master
host: docs.bernardomg.com
secrets:
url: ${{ secrets.DEPLOY_DOCS_SITE }}
username: ${{ secrets.DEPLOY_DOCS_USER }}
password: ${{ secrets.DEPLOY_DOCS_PASSWORD }}
21 changes: 0 additions & 21 deletions .github/workflows/testing.yml
View file

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ local.properties
.idea
*.iml

# Visual Studio #
.vscode/
.factorypath

# Windows files #
Thumbs.db
Desktop.ini
Expand Down
155 changes: 46 additions & 109 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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>

<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>

<!-- ********************************************** -->
<!-- ****************** BASE POM ****************** -->
<!-- ***************** PARENT POM ***************** -->
<!-- ********************************************** -->

<parent>
<groupId>com.bernardomg.maven</groupId>
<artifactId>base-pom</artifactId>
<version>1.3.4</version>
<version>1.5.2</version>
</parent>

<!-- ********************************************** -->
Expand All @@ -24,7 +19,7 @@

<groupId>com.bernardomg.util</groupId>
<artifactId>keystore-generator</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<packaging>jar</packaging>

<name>Keystore Generator</name>
Expand Down Expand Up @@ -62,98 +57,43 @@
<notifiers />
</ciManagement>

<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>releases</id>
<name>Releases Repository</name>
<url>https://api.bintray.com/maven/bernardo-mg/maven/keystore-generator</url>
</repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>snapshots</id>
<name>Snapshots Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<!-- ********************************************** -->
<!-- ****************** PROFILES ****************** -->
<!-- ********************************************** -->

<profiles>
<!-- ============================================== -->
<!-- ============ DEPLOYMENT PROFILES ============= -->
<!-- ============================================== -->
<profile>
<!-- Profile for the Eclipse Maven plugin -->
<!-- Sets the POM so this plugin does not give the usual unregistered goals
errors -->
<!-- It will be activated automatically on Eclipse if this has the m2e plugin,
by detecting the version property -->
<id>eclipse-maven</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<!-- m2e lifecycle mapping -->
<!-- This is used to configure the Maven plugin for Eclipse. -->
<!-- Among other things, it allows registering goals, which
Eclipse would otherwise reject. -->
<!-- It has no real effect on Maven. -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>${plugin.lifecycle.version}</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<!-- Release site deployment profile. -->
<!-- Sets the site repository to point to the releases repo. -->
<id>deployment-release</id>
<!-- Site deployment profile -->
<!-- Sets the site repository to point to the releases repo -->
<id>deployment-site</id>
<activation>
<!-- Active by default so the repository appears in the reports. -->
<!-- Active by default so the repository appears in the reports -->
<activeByDefault>true</activeByDefault>
</activation>
<distributionManagement>
<site>
<id>site</id>
<name>Project Documentation Site</name>
<!-- The URL should be set externally -->
<url>${site.release.url}</url>
<url>${site.url}</url>
</site>
</distributionManagement>
</profile>
<profile>
<!-- Development site deployment profile. -->
<!-- Sets the site repository to point to the development repo. -->
<id>deployment-development</id>
<!-- Github deployment profile. -->
<id>deployment-github</id>
<distributionManagement>
<site>
<id>site-development</id>
<name>Project Development Documentation Site</name>
<!-- The URL should be set externally -->
<url>${site.develop.url}</url>
</site>
<repository>
<!-- Github repository -->
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/Bernardo-MG/dice-notation-java</url>
</repository>
</distributionManagement>
</profile>
<profile>
<!-- Deployment profile. -->
<!-- Sets ups the environment for deployment. -->
<id>deployment</id>
<properties>
<!-- Tests are skipped. -->
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
</profiles>

<!-- ********************************************** -->
Expand Down Expand Up @@ -193,21 +133,25 @@
<!-- ============================================== -->
<!-- =========== DEPENDENCIES VERSIONS ============ -->
<!-- ============================================== -->
<bouncycastle.version>1.66</bouncycastle.version>
<commons.io.version>2.8.0</commons.io.version>
<guava.version>29.0-jre</guava.version>
<log4j.version>2.13.3</log4j.version>
<picocli.version>4.4.0</picocli.version>
<slf4j.version>1.7.30</slf4j.version>
<spring.boot.version>2.3.1.RELEASE</spring.boot.version>
<bouncycastle.version>1.70</bouncycastle.version>
<commons.io.version>2.11.0</commons.io.version>
<guava.version>31.1-jre</guava.version>
<picocli.version>4.6.3</picocli.version>
<spring.boot.version>2.5.3</spring.boot.version>
<!-- ============================================== -->
<!-- ============== PLUGINS VERSIONS ============== -->
<!-- ============================================== -->
<plugin.spring.boot.version>${spring.boot.version}</plugin.spring.boot.version>
<!-- ============================================== -->
<!-- ============ PLUGIN CONFIGURATION ============ -->
<!-- ============================================== -->
<!-- Checkstyle customized rules file -->
<checkstyle.config.location>${project.basedir}/src/config/checkstyle/checkstyle-rules.xml</checkstyle.config.location>
<!-- ============================================== -->
<!-- ================= MAVEN SITE ================= -->
<!-- ============================================== -->
<site.skin.version>2.0.8</site.skin.version>
<site.skin.version>2.2.7</site.skin.version>
<githubArtifactURL><![CDATA[https://github.com/${repoUserId}?tab=packages&amp;repo_name={project.artifactId}]]></githubArtifactURL>
<!-- ============================================== -->
<!-- ================= EXECUTABLE ================= -->
<!-- ============================================== -->
Expand All @@ -219,6 +163,19 @@
<!-- *************** DEPENDENCIES ***************** -->
<!-- ********************************************** -->

<dependencyManagement>
<dependencies>
<dependency>
<!-- Spring Boot Dependencies BOM -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<!-- Guava -->
Expand Down Expand Up @@ -263,19 +220,16 @@
<!-- SLF4J API -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<!-- Log4j SLF4J Bridge -->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<!-- Log4j core -->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -380,23 +334,6 @@

<reporting>
<plugins>
<plugin>
<!-- Checkstyle -->
<!-- Checks that the source files comply with style standards -->
<!-- It is using a customized rules file -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<!-- The customized rules file -->
<configLocation>${project.basedir}/src/config/checkstyle/checkstyle-rules.xml</configLocation>
</configuration>
</plugin>
<plugin>
<!-- FindBugs -->
<!-- Checks for patterns which are prone to errors -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- PMD -->
<!-- Checks that the code complies with a series of code quality rules -->
Expand All @@ -412,4 +349,4 @@
</plugins>
</reporting>

</project>
</project>
Loading

0 comments on commit eca0b20

Please sign in to comment.