Skip to content

Update from template #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fd163ab
Bump com.puppycrawl.tools:checkstyle from 10.14.1 to 10.14.2
dependabot[bot] Mar 18, 2024
3798841
Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Mar 19, 2024
9f760aa
Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.0 to 3.2.1
dependabot[bot] Mar 19, 2024
2bc07f7
Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.0 to 3.7.1
dependabot[bot] Mar 19, 2024
9b5b2f7
Fix mvnw location
AB-xdev Mar 25, 2024
cfed414
Merge pull request #30 from xdev-software/dependabot/maven/com.puppyc…
AB-xdev Mar 25, 2024
87530b7
Merge pull request #31 from xdev-software/dependabot/maven/org.apache…
AB-xdev Mar 25, 2024
8e97f38
Merge pull request #32 from xdev-software/dependabot/maven/org.apache…
AB-xdev Mar 25, 2024
93b643d
Merge pull request #33 from xdev-software/dependabot/maven/org.apache…
AB-xdev Mar 25, 2024
c1adfaf
Correct SCM connection info
AB-xdev Mar 26, 2024
4e2aa3b
Improve pages representation
AB-xdev Mar 26, 2024
913db08
Update checkstyle-idea.xml
AB-xdev Mar 26, 2024
3e37c59
Merge pull request #34 from xdev-software/update-from-template
AB-xdev Mar 26, 2024
bc0cd3a
Update maven-gpg-plugin
AB-xdev Mar 26, 2024
b2a23b1
Bump com.puppycrawl.tools:checkstyle from 10.14.2 to 10.15.0
dependabot[bot] Apr 2, 2024
e200398
Merge pull request #35 from xdev-software/dependabot/maven/com.puppyc…
AB-xdev Apr 3, 2024
0af9590
Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1
dependabot[bot] Apr 5, 2024
a60555e
Merge pull request #36 from xdev-software/dependabot/maven/org.apache…
AB-xdev Apr 8, 2024
8f204f5
Introduce Renovate
AB-xdev Apr 10, 2024
60b02dc
Merge pull request #38 from xdev-software/update-from-template
AB-xdev Apr 10, 2024
84e5c38
Update dependency maven to v3.9.6
xdev-renovate Apr 10, 2024
a27c4ef
Update peaceiris/actions-gh-pages action to v4
xdev-renovate Apr 10, 2024
f882fbb
Merge pull request #40 from xdev-software/renovate/peaceiris-actions-…
AB-xdev Apr 10, 2024
2cae3d4
Merge pull request #39 from xdev-software/renovate/maven-3.x
AB-xdev Apr 10, 2024
4865729
Modify workflows for renovate
AB-xdev Apr 10, 2024
d21aae6
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3
xdev-renovate Apr 11, 2024
b581783
Merge pull request #41 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Apr 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .github/dependabot.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:

code-style:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

strategy:
matrix:
Expand Down
40 changes: 8 additions & 32 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@ jobs:

- name: Un-SNAP
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
(cd "$i" && ../mvnw -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
(cd "$i" && $mvnwPath -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
done

- name: Get version
Expand Down Expand Up @@ -137,7 +138,6 @@ jobs:
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

publish-pages:
name: Publish dependencies and licenses to github pages
runs-on: ubuntu-latest
needs: [prepare_release]
steps:
Expand All @@ -156,40 +156,15 @@ jobs:
distribution: 'temurin'
cache: 'maven'

- name: Build dependencies/licenses files
run: mvn -B project-info-reports:dependencies
- name: Build site
run: ../mvnw -B site
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

- name: Upload licenses - Upload Artifact
uses: actions/upload-artifact@v4
with:
name: dependencies-licenses
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site

- name: Generate docs/dependencies dir
run: mkdir -p docs/dependencies

- name: Move built files into docs/dependencies
run: mv ${{ env.PRIMARY_MAVEN_MODULE }}/target/site/* docs/dependencies

- name: Rename dependencies.html to index.html
working-directory: docs/dependencies
run: mv dependencies.html index.html

- name: Copy Readme into docs (as index.md)
run: cp README.md docs/index.md

- name: Configure Pages
working-directory: docs
run: |-
echo "theme: jekyll-theme-tactile" > _config.yml

- name: Deploy to Github pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs
enable_jekyll: true
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site

after_release:
runs-on: ubuntu-latest
Expand All @@ -205,12 +180,13 @@ jobs:

- name: Inc Version and SNAP
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
(cd "$i" && ../mvnw -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
(cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
done

- name: Git Commit and Push
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ jobs:
sonar:
name: SonarCloud Scan
runs-on: ubuntu-latest
# Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ If you need support as soon as possible and you can't wait for any pull request,
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.

## Dependencies and Licenses
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/standard-maven-template/dependencies/)
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/standard-maven-template/dependencies)
4 changes: 4 additions & 0 deletions renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"rebaseWhen": "behind-base-branch"
}
6 changes: 3 additions & 3 deletions standard-maven-template-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
Expand All @@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.0</version>
<version>3.7.1</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.14.1</version>
<version>10.15.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down
24 changes: 19 additions & 5 deletions standard-maven-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<scm>
<url>https://github.com/xdev-software/standard-maven-template</url>
<connection>https://github.com/xdev-software/standard-maven-template.git</connection>
<connection>scm:git:https://github.com/xdev-software/standard-maven-template.git</connection>
</scm>

<inceptionYear>2023</inceptionYear>
Expand Down Expand Up @@ -85,6 +85,20 @@
</distributionManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
Expand Down Expand Up @@ -118,7 +132,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<release>${maven.compiler.release}</release>
<compilerArgs>
Expand Down Expand Up @@ -147,7 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -168,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.3</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -216,7 +230,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.14.1</version>
<version>10.15.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down