Skip to content

Commit

Permalink
Merge branch 'main' into features/90_Build-with-Java-17
Browse files Browse the repository at this point in the history
# Conflicts:
#	archetype/pom.xml
#	cdi-config-extension/pom.xml
#	pom.xml
  • Loading branch information
Riduidel committed Sep 6, 2023
2 parents 444039f + 67cfd30 commit cb06683
Show file tree
Hide file tree
Showing 75 changed files with 2,246 additions and 5,215 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/on_release_update_readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ on:
types:
- published # It seems that you can publish directly witout creating
jobs:
replace_version_in_README:
replace_version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Modify version number in README
uses: mingjun97/file-regex-replace@master
uses: vyan024/file-regex-replace-2023
with:
regex: '=[0-9]+\.[0-9]+\.[0-9]+ '
replacement: '=${{ github.event.release.tag_name }} '
include: '^README\.md' # Optional, defaults to ".*"
- name: Modify version number in release action
uses: mingjun97/file-regex-replace@master
uses: vyan024/file-regex-replace-2023
with:
regex: '=[0-9]+\.[0-9]+\.[0-9]+ '
regex: '"[0-9]+\.[0-9]+\.[0-9]+"'
replacement: '=${{ github.event.release.tag_name }} '
include: '^\.github\/workflows\/on_release_perform_maven_release\.yml' # Optional, defaults to ".*"
include: '^\.github\/workflows\/on_workflow_dispatch_perform_maven_release\.yml' # Optional, defaults to ".*"
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
Expand All @@ -35,7 +35,4 @@ jobs:
title: '🤖 Update readme version to ${{ github.event.release.tag_name }}'
body: |
This pull request has been generated by run of GitHub action ".github/workflows/on_release_update_readme.yml"
team-reviewers: |
owners
maintainers
draft: false
11 changes: 6 additions & 5 deletions .github/workflows/on_tag_generate_release_notes.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: On tag created generate GitHub release notes
name: On tag created generate GitHub release with notes
on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Generate release notes
uses: raulanatol/github-actions-releaser@main
- uses: lakto/gren-action@v2.0.0
env:
GITHUB_TOKEN: ${{ secrets.TOKEN_FOR_GITHUB }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
options: '--override'
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: On GitHub Release perform equivalent maven release

#on:
# release:
# types:
# - created
# - published
name: On workflow dispatch start maven release

on:
workflow_dispatch:
inputs:
releaseversion:
description: 'Release version'
required: true
default: '0.1.10'
default: "0.1.11"

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can use the archetype by running this maven-friendly 😅command.
Current version is ![GitHub version](https://badge.fury.io/gh/Riduidel%2Faadarchi.svg)

```sh
mvn archetype:generate -DarchetypeVersion=0.1.10 -Daadarchi-version=0.1.10 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype
mvn archetype:generate -DarchetypeVersion=0.1.11 -Daadarchi-version=0.1.11 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype
```

This will ask you a few questions and generate the project.
Expand Down
2 changes: 1 addition & 1 deletion aadarchi-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>system</artifactId>
<groupId>io.github.Riduidel.aadarchi</groupId>
<version>0.1.11-SNAPSHOT</version>
<version>0.1.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions aadarchi-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.11-SNAPSHOT</version>
<version>0.1.12-SNAPSHOT</version>
</parent>
<name>Aadarchi: test utilities</name>
<name>Aadarchi : test utilities</name>
<artifactId>aadarchi-test-utils</artifactId>
<description>Some test utilities dedicated to the improvement of Aadarchi quality.
Mainly contains tools allowing easy injection of Maven properties into tests</description>
Expand Down
2 changes: 1 addition & 1 deletion adr-tickets-extractor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.11-SNAPSHOT</version>
<version>0.1.12-SNAPSHOT</version>
</parent>
<artifactId>adr-tickets-extractor</artifactId>
<name>Aadarchi : ADR ticket extractor</name>
Expand Down
2 changes: 1 addition & 1 deletion archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.Riduidel.aadarchi</groupId>
<artifactId>system</artifactId>
<version>0.1.10</version>
<version>0.1.12-SNAPSHOT</version>
</parent>
<artifactId>archetype</artifactId>
<packaging>maven-archetype</packaging>
Expand Down
Loading

0 comments on commit cb06683

Please sign in to comment.