Switch master to main, Update build/dependencies (#630)

JodaOrg · Aug 24, 2022 · eb9644e · eb9644e
1 parent f33d05b
commit eb9644e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/.github/website.sh b/.github/website.sh
@@ -16,9 +16,9 @@ cp -R ../site joda-time/
 echo "## update..."
 git add -A
 git status
-git commit --message "Update joda-time from Travis: Build $TRAVIS_BUILD_NUMBER"
+git commit --message "Update joda-time from CI: $GITHUB_ACTION"
 
 echo "## push..."
-git push origin master
+git push origin main
 
 echo "## done"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,10 +9,13 @@ on:
     tags:
       - 'v*'
       - 'website*'
-  pull_request:
+  pull_request_target:
     branches:
       - '*'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -24,8 +27,8 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3  #v3.4.1
       with:
-        java-version: '8'
-        distribution: 'corretto'
+        java-version: 8
+        distribution: 'temurin'
         cache: 'maven'
 
     - name: Maven version

diff --git a/.github/workflows/tzdbupdate.yml b/.github/workflows/tzdbupdate.yml
@@ -3,7 +3,7 @@ name: TZDB check
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
       - 'enhance*'
   schedule:
     - cron: '50 1 * * *'

diff --git a/pom.xml b/pom.xml
@@ -379,7 +379,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>3.5.0</version>
+                  <version>3.6.0</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -1002,13 +1002,13 @@
     <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
     <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-    <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
+    <maven-install-plugin.version>3.0.1</maven-install-plugin.version>
     <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-    <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
-    <maven-jxr-plugin.version>3.2.0</maven-jxr-plugin.version>
+    <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+    <maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
     <maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
-    <maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
-    <maven-project-info-reports-plugin.version>3.4.0</maven-project-info-reports-plugin.version>
+    <maven-pmd-plugin.version>3.18.0</maven-pmd-plugin.version>
+    <maven-project-info-reports-plugin.version>3.4.1</maven-project-info-reports-plugin.version>
     <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
     <maven-repository-plugin.version>2.4</maven-repository-plugin.version>
     <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,11 @@
   <body>
 
     <!-- types are add, fix, remove, update -->
+    <release version="SNAPSHOT" date="SNAPSHOT" description="SNAPSHOT">
+      <action dev="jodastephen" type="update">
+        Switch master to main.
+      </action>
+    </release>
     <release version="2.11.0" date="2022-08-12" description="v2.11.0">
       <action dev="jodastephen" type="fix">
         Change DateTimeZone to use 'org.joda.time.DateTimeZone.Timezone' instead of 'user.timezone'.