Skip to content

Commit

Permalink
Switch to main, Update build scripts, dependabot (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
jodastephen authored Aug 24, 2022
1 parent 8384c6d commit 4efcc95
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 16 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Dependabot config

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: weekly
time: "02:30"
open-pull-requests-limit: 20
4 changes: 2 additions & 2 deletions .github/website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ cp -R ../site joda-collect/
echo "## update..."
git add -A
git status
git commit --message "Update joda-beans from CI: $GITHUB_ACTION"
git commit --message "Update joda-collect from CI: $GITHUB_ACTION"

echo "## push..."
git push origin master
git push origin main

echo "## done"
25 changes: 13 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,36 @@ on:
- 'website*'
pull_request:
branches:
- 'master'
- '*'

permissions:
contents: read

jobs:
build:
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
28 changes: 26 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<!-- Enforce Maven 3.6.0 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -48,8 +68,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>26.0-jre</version>
<version>31.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
Expand Down Expand Up @@ -79,7 +103,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 3 additions & 0 deletions src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<action dev="jodastephen" type="add">
Add Tidelift commercial support and security policy.
</action>
<action dev="jodastephen" type="update">
Switch master to main.
</action>
</release>
<release version="1.0.1" date="2018-05-09" description="v1.0.1">
<action dev="jodastephen" type="update">
Expand Down

0 comments on commit 4efcc95

Please sign in to comment.