Skip to content

Commit

Permalink
Update dependencies and build scripts (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
jodastephen committed Aug 14, 2022
1 parent 9bceeac commit 7bf22d6
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 15 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/build.yml
Expand Up @@ -16,28 +16,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [1.8, 11]
java: [8, 11]

steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2

- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 #v3.4.1
with:
java-version: ${{ matrix.java }}
- name: Checkout
uses: actions/checkout@v2
- name: Maven cache
uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('.github/workflows/build.yml') }}
restore-keys: |
${{ runner.os }}-maven-
distribution: 'temurin'
cache: 'maven'

- name: Maven version
run: |
mkdir -p ./.mvn
echo '-e -B -DtrimStackTrace=false' > ./.mvn/maven.config
mvn --version
mkdir -p target
- name: Maven build
run: |
mvn install site
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -87,6 +87,7 @@ Tidelift will coordinate the fix and disclosure.

* Update version (README.md, index.md, changes.xml)
* Commit and push
* Switch to Java 11
* `mvn clean release:clean release:prepare release:perform`
* `git fetch`
* Website will be built and released by GitHub Actions
52 changes: 48 additions & 4 deletions pom.xml
Expand Up @@ -28,6 +28,17 @@
</scm>

<!-- ==================================================================== -->
<developers>
<developer>
<id>jodastephen</id>
<name>Stephen Colebourne</name>
<roles>
<role>Project Lead</role>
</roles>
<timezone>0</timezone>
<url>https://github.com/jodastephen</url>
</developer>
</developers>
<contributors>
<contributor>
<name>Ashish Kumar</name>
Expand Down Expand Up @@ -64,6 +75,29 @@

<!-- ==================================================================== -->
<build>
<pluginManagement>
<plugins>
<!-- Setup release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<arguments>-Doss.repo</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>v@{project.version}</tagNameFormat>
<localCheckout>true</localCheckout>
</configuration>
<dependencies>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>${github-api.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- Turn on Checkstyle -->
<plugin>
Expand All @@ -83,20 +117,20 @@
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>2.1.1</version>
<version>${joda-convert.version}</version>
<scope>compile</scope>
<optional>true</optional><!-- mandatory in Scala -->
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.tngtech.java</groupId>
<artifactId>junit-dataprovider</artifactId>
<version>1.10.0</version>
<version>${junit-dataprovider.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -140,7 +174,7 @@
<plugin>
<groupId>de.jutzig</groupId>
<artifactId>github-release-plugin</artifactId>
<version>1.4.0</version>
<version>${github-release-plugin.version}</version>
<configuration>
<releaseName>Release v${project.version}</releaseName>
<description>See the [change notes](https://www.joda.org/${joda.artifactId}/changes-report.html#a${project.version}) for more information.</description>
Expand Down Expand Up @@ -173,10 +207,20 @@

<!-- ==================================================================== -->
<properties>
<!-- Dependencies -->
<junit-dataprovider.version>1.13.1</junit-dataprovider.version>
<joda-convert.version>2.2.2</joda-convert.version>
<junit.version>4.13.2</junit.version>
<!-- Plugins -->
<github-api.version>1.307</github-api.version>
<github-release-plugin.version>1.4.0</github-release-plugin.version>
<!-- Parent pom.xml control -->
<joda.osgi.packages>org.joda.money.*</joda.osgi.packages>
<joda.module.name>org.joda.money</joda.module.name>
<joda.artifactId>joda-money</joda.artifactId>
<joda.surefire.moduleargs>--add-modules org.joda.convert</joda.surefire.moduleargs>
<stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
<revapi-maven-plugin.version>0.10.0</revapi-maven-plugin.version>
<revapi-java.version>0.15.1</revapi-java.version>
</properties>
</project>

0 comments on commit 7bf22d6

Please sign in to comment.