Update build (#114)

JodaOrg · Aug 24, 2022 · 7fef23c · 7fef23c
1 parent eba0313
commit 7fef23c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/.github/website.sh b/.github/website.sh
@@ -16,9 +16,9 @@ cp -R ../site joda-money/
 echo "## update..."
 git add -A
 git status
-git commit --message "Update joda-beans from CI: $GITHUB_ACTION"
+git commit --message "Update joda-money 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
@@ -7,9 +7,12 @@ on:
     tags:
       - 'v*'
       - 'website*'
-  pull_request:
+  pull_request_target:
     branches:
-      - 'master'
+      - '*'
+
+permissions:
+  contents: read
 
 jobs:
   build:

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.joda</groupId>
     <artifactId>joda-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>joda-money</artifactId>
@@ -109,6 +109,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>
 
@@ -212,7 +232,7 @@
     <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-api.version>1.308</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>

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="1.0.3" date="SNAPSHOT" description="v1.0.3">
+      <action dev="jodastephen" type="update">
+        Switch master to main.
+      </action>
+    </release>
     <release version="1.0.2" date="2022-08-14" description="v1.0.2">
       <action dev="jodastephen" type="update">
         Change currency SLL to SLE.