MNT Update release dependencies

MNT Update development dependencies
Merge branch '5.0' into 5
2023-09-01 09:41:23 +12:00 · 2023-08-31 12:59:01 +12:00 · 2023-08-30 10:37:20 +12:00 · 2023-08-29 17:07:49 +12:00 · 2023-08-29 15:14:13 +12:00 · 2023-08-15 12:26:54 +12:00
4 changed files with 20 additions and 23 deletions
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@ -1,10 +1,10 @@
 name: Keepalive

 on:
-  workflow_dispatch:
-  # The 4th of every month at 10:50am UTC
+  # At 1:05 PM UTC, on day 14 of the month
  schedule:
-    - cron: '50 10 4 * *'
+    - cron: '5 13 14 * *'
+  workflow_dispatch:

 jobs:
  keepalive:
--- a/.htaccess
+++ b/.htaccess
@ -1,2 +0,0 @@
-RewriteEngine On
-RewriteRule ^(.*)$ public/$1
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2018, SilverStripe Ltd.
+Copyright (c) 2018, Silverstripe Ltd.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/composer.json
+++ b/composer.json
@ -5,29 +5,28 @@
    "homepage": "http://silverstripe.org",
    "license": "BSD-3-Clause",
    "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/recipe-plugin": "^1.7",
-        "silverstripe/recipe-core": "4.x-dev",
-        "silverstripe/admin": "1.x-dev",
-        "silverstripe/asset-admin": "1.x-dev",
-        "silverstripe/campaign-admin": "1.x-dev",
-        "silverstripe/versioned-admin": "1.x-dev",
-        "silverstripe/cms": "4.x-dev",
-        "silverstripe/errorpage": "1.x-dev",
-        "silverstripe/reports": "4.x-dev",
-        "silverstripe/siteconfig": "4.x-dev",
-        "silverstripe/versioned": "1.x-dev",
-        "silverstripe/graphql": "3.x-dev || 4.x-dev",
-        "silverstripe/session-manager": "1.x-dev"
+        "php": "^8.1",
+        "silverstripe/recipe-plugin": "~2.0.0@stable",
+        "silverstripe/recipe-core": "~5.1.0@beta",
+        "silverstripe/admin": "~2.1.0@beta",
+        "silverstripe/asset-admin": "~2.1.0@beta",
+        "silverstripe/campaign-admin": "~2.1.0@beta",
+        "silverstripe/versioned-admin": "~2.1.0@beta",
+        "silverstripe/cms": "~5.1.0@beta",
+        "silverstripe/errorpage": "~2.1.0@beta",
+        "silverstripe/reports": "~5.1.0@beta",
+        "silverstripe/siteconfig": "~5.1.0@beta",
+        "silverstripe/versioned": "~2.1.0@beta",
+        "silverstripe/graphql": "~5.1.0@beta",
+        "silverstripe/session-manager": "~2.1.0@beta"
    },
    "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.6"
    },
    "extra": {
        "project-files": [
            "app/src/*"
-        ],
-        "resources-dir": "_resources"
+        ]
    },
    "config": {
        "process-timeout": 600
Author	SHA1	Message	Date
Guy Sartorelli	74a4a59642	MNT Update release dependencies	2023-09-01 09:41:23 +12:00
Guy Sartorelli	15a406f1b5	MNT Update development dependencies	2023-08-31 12:59:01 +12:00
Guy Sartorelli	eb0aa9b900	Merge branch '5.0' into 5	2023-08-30 10:37:20 +12:00
Guy Sartorelli	942b0bc29b	Merge pull request #77 from creative-commoners/pulls/5.0/module-standardiser-1693278853 MNT Run module-standardiser	2023-08-29 17:07:49 +12:00
Steve Boyd	8a07c42493	MNT Run module-standardiser	2023-08-29 15:14:13 +12:00
Guy Sartorelli	54bdd6cbdc	Merge pull request #76 from creative-commoners/pulls/5/module-standardiser-1691550241 MNT Run module-standardiser	2023-08-15 12:26:54 +12:00
Steve Boyd	3c8a6ded76	MNT Run module-standardiser	2023-08-14 15:47:05 +12:00
Steve Boyd	f7c60ce701	MNT Update development dependencies	2023-05-04 13:26:56 +12:00
Steve Boyd	712e6fcd86	Merge branch '5.0' into 5	2023-05-04 13:26:56 +12:00
Steve Boyd	da53fa8ab7	MNT Update development dependencies	2023-05-04 12:35:46 +12:00
Steve Boyd	ed2e1b829d	MNT Update release dependencies	2023-05-04 12:35:40 +12:00
Guy Sartorelli	432a87efb9	Merge branch '4' into 5.0 # Conflicts: # composer.json	2023-04-27 14:38:01 +12:00
Steve Boyd	7355535fe9	MNT Update development dependencies	2023-04-05 14:54:20 +12:00
Steve Boyd	1bfcef461b	MNT Update release dependencies	2023-04-05 14:54:16 +12:00
Steve Boyd	2e8e4b8a8a	MNT Update development dependencies	2023-04-05 11:54:33 +12:00
Steve Boyd	62d9427773	MNT Update development dependencies	2023-02-09 15:04:32 +13:00
Steve Boyd	30dae8e7da	MNT Update release dependencies	2023-02-09 15:04:28 +13:00
Steve Boyd	b166df82c8	MNT Update development dependencies	2023-02-09 12:36:37 +13:00
Guy Sartorelli	9c8ca53d16	Merge branch '4' into 5	2023-02-08 15:26:33 +13:00
Guy Sartorelli	7bae3fb781	MNT Remove unnecessary .htaccess file (#65 ) This file will be included via recipe-core	2022-12-16 10:06:31 +13:00
Guy Sartorelli	76b312bb42	Merge pull request #60 from creative-commoners/pulls/5/major-deps DEP Update core dependencies for CMS 5	2022-08-09 10:06:53 +12:00
Guy Sartorelli	b61004ebe1	ENH Remove resources-dir config from composer.json (#59 )	2022-08-05 13:53:43 +12:00
Steve Boyd	6e7dce8f2e	DEP Update core dependencies for CMS 5	2022-08-05 09:41:50 +12:00