Skip to content

Commit

Permalink
build: Streamline build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Mar 25, 2024
1 parent 0ef18e3 commit afc5314
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
cache: maven

- name: Cache Gradle
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
restore-keys: ${{ runner.os }}-gradle-

- name: Cache Gradle wrapper
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/early-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4

- name: Cancel previous run
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -55,14 +55,14 @@ jobs:
cache: maven

- name: Cache Gradle
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
restore-keys: ${{ runner.os }}-gradle-

- name: Cache Gradle wrapper
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }}
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
cache: maven

- name: Cache Gradle
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
restore-keys: ${{ runner.os }}-gradle-

- name: Cache Gradle wrapper
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradlew-${{ hashFiles('**/gradlew') }}
Expand Down Expand Up @@ -100,6 +100,14 @@ jobs:
out/jreleaser/trace.log
out/jreleaser/output.properties
- name: Reset reproducible timestamp
run: |
sed -i -e "[email protected]>.*</[email protected]>\${git.commit.author.time}</project.build.outputTimestamp@g" pom.xml
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "GitHub Action"
git commit -a -m "Reset reproducible timestamp expression"
git push origin master
- name: Build site
run: |
export GPG_TTY=$(tty)
Expand Down
15 changes: 15 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@
<maven.version>3.9.1</maven.version>
<maven.resolver.version>1.9.18</maven.resolver.version>
<commons.lang3.version>3.14.0</commons.lang3.version>
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.dependency.plugin>3.6.1</version.dependency.plugin>
<version.enforcer.plugin>3.4.1</version.enforcer.plugin>
<version.enforcer.rules>1.8.0</version.enforcer.rules>
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
<version.jar.plugin>3.3.0</version.jar.plugin>
<version.resources.plugin>3.3.1</version.resources.plugin>
<version.shade.plugin>3.5.2</version.shade.plugin>
<version.source.plugin>3.3.0</version.source.plugin>
<version.versions.plugin>2.16.2</version.versions.plugin>
</properties>

<name>pomchecker</name>
Expand Down Expand Up @@ -262,6 +272,11 @@
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${version.shade.plugin}</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down
5 changes: 1 addition & 4 deletions pomchecker-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
</parent>

<artifactId>pomchecker-cli</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<application.main.class>org.kordamp.maven.checker.cli.Main</application.main.class>
Expand Down Expand Up @@ -200,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
<version>3.7.1</version>
<configuration>
<attach>false</attach>
<appendAssemblyId>false</appendAssemblyId>
Expand All @@ -223,7 +221,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<dependencies>
<dependency>
<groupId>org.kordamp.shade</groupId>
Expand Down
2 changes: 0 additions & 2 deletions pomchecker-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
</parent>

<artifactId>pomchecker-core</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>pomchecker-core</name>
<description>POM validation core implementation</description>
Expand Down
2 changes: 0 additions & 2 deletions pomchecker-enforcer-rules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
</parent>

<artifactId>pomchecker-enforcer-rules</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>pomchecker-enforcer-rules</name>
<description>POM validation enforcer rules</description>
Expand Down
3 changes: 1 addition & 2 deletions pomchecker-gradle-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
</parent>

<artifactId>pomchecker-gradle-plugin</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand All @@ -41,7 +40,7 @@
<gradle.tasks>build</gradle.tasks>
<maven.main.skip>true</maven.main.skip>
<maven.test.skip>true</maven.test.skip>
<version.exec.plugin>3.1.0</version.exec.plugin>
<version.exec.plugin>3.2.0</version.exec.plugin>
</properties>

<name>pomchecker-gradle-plugin</name>
Expand Down
3 changes: 1 addition & 2 deletions pomchecker-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
</parent>

<artifactId>pomchecker-maven-plugin</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<properties>
Expand Down Expand Up @@ -84,7 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
Expand Down
5 changes: 1 addition & 4 deletions pomchecker-toolprovider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
</parent>

<artifactId>pomchecker-toolprovider</artifactId>
<version>1.11.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<java.version>9</java.version>
Expand Down Expand Up @@ -96,7 +94,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<dependencies>
<dependency>
<groupId>org.kordamp.shade</groupId>
Expand Down Expand Up @@ -138,7 +135,7 @@
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>1.0.0.RC3</version>
<version>1.2.0.Final</version>
<executions>
<execution>
<id>add-module-info</id>
Expand Down

0 comments on commit afc5314

Please sign in to comment.