Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update references for repository rename to openremote/core (#3406)

Wouter Born37dc3e08fdfa
diff --git a/.ci_cd/README.md b/.ci_cd/README.md
index 69407d51b..106b78fe8 100644
--- a/.ci_cd/README.md
+++ b/.ci_cd/README.md
@@ -16,7 +16,7 @@ docker image tag updates. The file layout is:
// Name of branch to react to (exact match)
"develop": {
// Comma separated list of tags to push to openremote/manager docker hub image
- // This can only be used on the main openremote repo (openremote/openremote)
+ // This can only be used on the OpenRemote Core repo (openremote/core)
"distribute": {
"docker": "develop"
},
@@ -26,7 +26,7 @@ docker image tag updates. The file layout is:
"environment": "staging"
}
},
- "master": {
+ "main": {
"distribute": {
"docker": "latest"
}
@@ -35,7 +35,7 @@ docker image tag updates. The file layout is:
// Configure behaviour on release
"release": {
// Comma separated list of tags to push to openremote/manager docker hub image $version is replaced with release version
- // This can only be used on the main openremote repo (openremote/openremote)
+ // This can only be used on the OpenRemote Core repo (openremote/core)
"distribute": {
"docker": "latest,$version",
"maven": "$version"
diff --git a/.ci_cd/aws/cloudformation-aws-marketplace.yml b/.ci_cd/aws/cloudformation-aws-marketplace.yml
index 27d5892de..3f7f6010a 100644
--- a/.ci_cd/aws/cloudformation-aws-marketplace.yml
+++ b/.ci_cd/aws/cloudformation-aws-marketplace.yml
@@ -307,7 +307,7 @@ Resources:
commands:
01_openremote_installation:
command: |
- curl -sL https://raw.githubusercontent.com/openremote/openremote/refs/heads/master/docker-compose.yml -o /home/ec2-user/docker-compose.yml
+ curl -sL https://raw.githubusercontent.com/openremote/core/refs/heads/main/docker-compose.yml -o /home/ec2-user/docker-compose.yml
test: ls /home/ec2-user/docker-compose.yml >/dev/null 2>&1; (( $? != 0 ))
start_openremote:
diff --git a/.ci_cd/aws/provision_account.sh b/.ci_cd/aws/provision_account.sh
index bbe8cc0ac..6b8939c10 100644
--- a/.ci_cd/aws/provision_account.sh
+++ b/.ci_cd/aws/provision_account.sh
@@ -155,8 +155,8 @@ if [ "$VPCID" == 'None' ]; then
TEMPLATE_PATH="${awsDir}cloudformation-create-vpc.yml"
elif [ -f ".ci_cd/aws/cloudformation-create-vpc.yml" ]; then
TEMPLATE_PATH=".ci_cd/aws/cloudformation-create-vpc.yml"
- elif [ -f "openremote/.ci_cd/aws/cloudformation-create-vpc.yml" ]; then
- TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-create-vpc.yml"
+ elif [ -f "core/.ci_cd/aws/cloudformation-create-vpc.yml" ]; then
+ TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-create-vpc.yml"
else
echo "Cannot determine location of cloudformation-create-vpc.yml"
exit 1
@@ -292,8 +292,8 @@ else
TEMPLATE_PATH="${awsDir}cloudformation-create-ssm-documents.yml"
elif [ -f ".ci_cd/aws/cloudformation-create-ssm-documents.yml" ]; then
TEMPLATE_PATH=".ci_cd/aws/cloudformation-create-ssm-documents.yml"
- elif [ -f "openremote/.ci_cd/aws/cloudformation-create-ssm-documents.yml" ]; then
- TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-create-ssm-documents.yml"
+ elif [ -f "core/.ci_cd/aws/cloudformation-create-ssm-documents.yml" ]; then
+ TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-create-ssm-documents.yml"
else
echo "Cannot determine location of cloudformation-create-ssm-documents.yml"
exit 1
@@ -340,8 +340,8 @@ else
TEMPLATE_PATH="${awsDir}cloudformation-create-dashboard.yml"
elif [ -f ".ci_cd/aws/cloudformation-create-dashboard.yml" ]; then
TEMPLATE_PATH=".ci_cd/aws/cloudformation-create-dashboard.yml"
- elif [ -f "openremote/.ci_cd/aws/cloudformation-create-dashboard.yml" ]; then
- TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-create-dashboard.yml"
+ elif [ -f "core/.ci_cd/aws/cloudformation-create-dashboard.yml" ]; then
+ TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-create-dashboard.yml"
else
echo "Cannot determine location of cloudformation-create-dashboard.yml"
exit 1
diff --git a/.ci_cd/aws/provision_host.sh b/.ci_cd/aws/provision_host.sh
index 9efe0e1f8..21f6a3b44 100644
--- a/.ci_cd/aws/provision_host.sh
+++ b/.ci_cd/aws/provision_host.sh
@@ -52,8 +52,8 @@ if [ -f "${awsDir}cloudformation-create-ec2.yml" ]; then
TEMPLATE_PATH="${awsDir}cloudformation-create-ec2.yml"
elif [ -f ".ci_cd/aws/cloudformation-create-ec2.yml" ]; then
TEMPLATE_PATH=".ci_cd/aws/cloudformation-create-ec2.yml"
-elif [ -f "openremote/.ci_cd/aws/cloudformation-create-ec2.yml" ]; then
- TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-create-ec2.yml"
+elif [ -f "core/.ci_cd/aws/cloudformation-create-ec2.yml" ]; then
+ TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-create-ec2.yml"
else
echo "Cannot determine location of cloudformation-create-ec2.yml"
exit 1
@@ -86,8 +86,8 @@ else
SMTP_TEMPLATE_PATH="${awsDir}cloudformation-create-smtp-user.yml"
elif [ -f ".ci_cd/aws/cloudformation-create-smtp-user.yml" ]; then
SMTP_TEMPLATE_PATH=".ci_cd/aws/cloudformation-create-smtp-user.yml"
- elif [ -f "openremote/.ci_cd/aws/cloudformation-create-smtp-user.yml" ]; then
- SMTP_TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-create-smtp-user.yml"
+ elif [ -f "core/.ci_cd/aws/cloudformation-create-smtp-user.yml" ]; then
+ SMTP_TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-create-smtp-user.yml"
else
echo "Cannot determine location of cloudformation-create-smtp-user.yml"
exit 1
@@ -347,8 +347,8 @@ else
HEALTH_TEMPLATE_PATH="${awsDir}cloudformation-healthcheck-alarm.yml"
elif [ -f ".ci_cd/aws/cloudformation-healthcheck-alarm.yml" ]; then
HEALTH_TEMPLATE_PATH=".ci_cd/aws/cloudformation-healthcheck-alarm.yml"
- elif [ -f "openremote/.ci_cd/aws/cloudformation-healthcheck-alarm.yml" ]; then
- HEALTH_TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-healthcheck-alarm.yml"
+ elif [ -f "core/.ci_cd/aws/cloudformation-healthcheck-alarm.yml" ]; then
+ HEALTH_TEMPLATE_PATH="core/.ci_cd/aws/cloudformation-healthcheck-alarm.yml"
else
echo "Cannot determine location of cloudformation-healthcheck-alarm.yml"
exit 1
diff --git a/.ci_cd/ci_cd.json b/.ci_cd/ci_cd.json
index 3535ffa8f..fc1a46426 100644
--- a/.ci_cd/ci_cd.json
+++ b/.ci_cd/ci_cd.json
@@ -1,6 +1,6 @@
{
"push": {
- "master": {
+ "main": {
"distribute": {
"docker": "develop-core",
"npm": "$version-core-snapshot"
diff --git a/.ci_cd/deploy.sh b/.ci_cd/deploy.sh
index f6642cd20..99aa2e199 100644
--- a/.ci_cd/deploy.sh
+++ b/.ci_cd/deploy.sh
@@ -48,9 +48,9 @@ HOST="$OR_HOSTNAME"
# Copy CI/CD files into temp dir
echo "Copying CI/CD files into temp dir"
-if [ "$IS_MAIN_REPO" == 'false' ]; then
- cp -r openremote/.ci_cd/host_init temp/
- cp -r openremote/.ci_cd/aws temp/
+if [ "$IS_CORE_REPO" == 'false' ]; then
+ cp -r core/.ci_cd/host_init temp/
+ cp -r core/.ci_cd/aws temp/
fi
if [ -d ".ci_cd/host_init" ]; then
cp -r .ci_cd/host_init temp/
diff --git a/.github/actions/check-if-main-repo/action.yml b/.github/actions/check-if-core-repo/action.yml
similarity index 70%
rename from .github/actions/check-if-main-repo/action.yml
rename to .github/actions/check-if-core-repo/action.yml
index 38ae12e06..1fe08a1e4 100644
--- a/.github/actions/check-if-main-repo/action.yml
+++ b/.github/actions/check-if-core-repo/action.yml
@@ -1,22 +1,22 @@
-name: Check if main repo
-description: Resolves- and checks if it is run from the main repository, and resolves the OpenRemote version
+name: Check if core repo
+description: Resolves- and checks if it is run from the core repository, and resolves the OpenRemote version
outputs:
value:
- description: Whether this is the main repository which builds the manager
- value: ${{ steps.is_main_repo.outputs.value }}
+ description: Whether this is the core repository which builds the manager
+ value: ${{ steps.is_core_repo.outputs.value }}
repository:
- description: The main GitHub repository name
- value: ${{ steps.is_main_repo.outputs.repository }}
+ description: The core GitHub repository name
+ value: ${{ steps.is_core_repo.outputs.repository }}
version:
- description: The openremote version defined in the main repo
- value: ${{ steps.is_main_repo.outputs.version }}
+ description: The openremote version defined in the core repo
+ value: ${{ steps.is_core_repo.outputs.version }}
runs:
using: composite
steps:
- - name: Check if main repo
- id: is_main_repo
+ - name: Check if core repo
+ id: is_core_repo
shell: bash
run: |
if [ -f manager/src/main/java/org/openremote/manager/Main.java ]; then
@@ -28,7 +28,7 @@ runs:
fi
echo "value=false" >> $GITHUB_OUTPUT
- echo "repository=$(sed -E 's#(.+)/.+#\1/openremote#' <<< $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
+ echo "repository=$(sed -E 's#(.+)/.+#\1/core#' <<< $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
version=""
if [ -f gradle/libs.versions.toml ]; then
diff --git a/.github/actions/process-cicd-json/action.yml b/.github/actions/process-cicd-json/action.yml
index 6d10965b6..3020d22fd 100644
--- a/.github/actions/process-cicd-json/action.yml
+++ b/.github/actions/process-cicd-json/action.yml
@@ -2,10 +2,10 @@ name: Process ci_cd.json file
description: Processes the ci_cd.json file to determine artifact publishing tags and deployments
inputs:
- IS_MAIN_REPO:
- description: Whether this is the main repository that builds the manager
+ IS_CORE_REPO:
+ description: Whether this is the core repository that builds the manager
MANAGER_VERSION:
- description: The manager version specified in the main repository
+ description: The manager version specified in the core repository
IS_RELEASE:
description: Whether this is a release
VERSION:
@@ -46,7 +46,7 @@ runs:
refName = os.getenv('GITHUB_REF_NAME')
refType = os.getenv('GITHUB_REF_TYPE')
repoOwner = os.getenv('GITHUB_REPOSITORY_OWNER')
- isMainRepo = os.getenv('IS_MAIN_REPO') == 'true'
+ isCoreRepo = os.getenv('IS_CORE_REPO') == 'true'
isRelease = os.getenv('IS_RELEASE') == 'true'
managerVersion = os.getenv('MANAGER_VERSION')
version = os.getenv('VERSION')
@@ -84,7 +84,7 @@ runs:
if 'npm' in distributeConfig['distribute']:
npmPublishTag = distributeConfig['distribute']['npm']
- if isMainRepo:
+ if isCoreRepo:
if dockerPublishTags is not None:
dockerPublishTags = ",".join(map(lambda t: t.strip(), dockerPublishTags.split(",")))
@@ -118,13 +118,13 @@ runs:
deployStr += deploy['environment']
deployStr += ":"
if 'managerTag' in deploy:
- if isMainRepo:
+ if isCoreRepo:
deployStr += deploy['managerTag']
else:
# Custom projects manager docker image must match the openremote version from gradle/libs.versions.toml
deployStr += managerVersion
else:
- if isMainRepo:
+ if isCoreRepo:
os.system("echo 'Manager tag not specified so using commit SHA'")
deployStr += managerTagDefault
else:
@@ -139,7 +139,7 @@ runs:
print(f"Deployments to deploy: {deployStr}")
os.system(f"echo 'deploys={deployStr}' >> $GITHUB_OUTPUT")
env:
- IS_MAIN_REPO: ${{ inputs.IS_MAIN_REPO }}
+ IS_CORE_REPO: ${{ inputs.IS_CORE_REPO }}
MANAGER_VERSION: ${{ inputs.MANAGER_VERSION }}
IS_RELEASE: ${{ inputs.IS_RELEASE }}
VERSION: ${{ inputs.VERSION }}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 031aa8457..1f845c50a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
schedule:
interval: "daily"
ignore:
- - dependency-name: "openremote/openremote"
+ - dependency-name: "openremote/core"
# Maintain npm/Yarn dependencies
- package-ecosystem: "npm"
diff --git a/.github/workflows/build-deployment-image.yml b/.github/workflows/build-deployment-image.yml
index 05b920f87..c47be30f4 100644
--- a/.github/workflows/build-deployment-image.yml
+++ b/.github/workflows/build-deployment-image.yml
@@ -1,4 +1,4 @@
-# Currently only used to test if it builds before merging to master
+# Currently only used to test if it builds before merging to main
name: Build deployment image
on:
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index 8334a4e7b..5f5a35108 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -28,11 +28,11 @@
# found that is output to 'ssh.key' file (so it is not copied to the host). Sensitive credentials should always be stored
# in github secrets so they are encrypted, do not store within repo files (even private repos as these are not encrypted).
#
-# SEE https://github.com/openremote/openremote/tree/master/.ci_cd for details of standard variables and handling.
+# SEE https://github.com/openremote/core/tree/main/.ci_cd for details of standard variables and handling.
#
# MANUAL TRIGGER
#
-# This workflow can be triggered by push, release, manually or schedule (from any repo other than openremote/openremote)
+# This workflow can be triggered by push, release, manually or schedule (from any repo other than openremote/core)
# if triggered manually then the following inputs are available and these override any set in env files and/or secrets:
#
# Inputs:
@@ -55,10 +55,10 @@
name: CI/CD
on:
- # Push on master excluding tags
+ # Push on main excluding tags
# push:
# branches:
- # - 'master'
+ # - 'main'
# tags:
# - '[0-9]+.[0-9]+.[0-9]+'
@@ -211,8 +211,8 @@ jobs:
if: steps.ui-files-changed.outputs.any_modified != 'true'
run: echo "value=true" >> $GITHUB_OUTPUT
- - name: Check if main repo
- id: is_main_repo
+ - name: Check if core repo
+ id: is_core_repo
run: |
if [ -f manager/src/main/java/org/openremote/manager/Main.java ]; then
echo "value=true" >> $GITHUB_OUTPUT
@@ -223,7 +223,7 @@ jobs:
fi
echo "value=false" >> $GITHUB_OUTPUT
- echo "repository=$(sed -E 's#(.+)/.+#\1/openremote#' <<< $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
+ echo "repository=$(sed -E 's#(.+)/.+#\1/core#' <<< $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
version=""
if [ -f gradle/libs.versions.toml ]; then
@@ -245,24 +245,27 @@ jobs:
echo "ref=$version" >> $GITHUB_OUTPUT
fi
- - name: Checkout main repo
+ - name: Checkout core repo
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- if: ${{ steps.is_main_repo.outputs.value == 'false' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'false' }}
with:
- repository: ${{ steps.is_main_repo.outputs.repository }}
- path: openremote
- ref: ${{ steps.is_main_repo.outputs.ref }}
- sparse-checkout: |
- .ci_cd
- profile
+ repository: ${{ steps.is_core_repo.outputs.repository }}
+ path: core
+ ref: ${{ steps.is_core_repo.outputs.ref }}
+ sparse-checkout: .ci_cd
sparse-checkout-cone-mode: false
+ # Compatibility with released scripts
+ - name: Provide legacy core repo checkout path
+ if: steps.is_core_repo.outputs.value == 'false'
+ run: ln -s core openremote
+
- name: Install node_modules
if: steps.ui-files-changed.outputs.any_modified == 'true'
run: yarn --immutable
- name: Check UI dependencies
- if: steps.ui-files-changed.outputs.any_modified == 'true' && steps.is_main_repo.outputs.value == 'true'
+ if: steps.ui-files-changed.outputs.any_modified == 'true' && steps.is_core_repo.outputs.value == 'true'
run: npx [email protected] -c ui/knip.jsonc
- name: Check deployment build.gradle
@@ -318,7 +321,7 @@ jobs:
refName = os.getenv('GITHUB_REF_NAME')
refType = os.getenv('GITHUB_REF_TYPE')
repoOwner = os.getenv('GITHUB_REPOSITORY_OWNER')
- isMainRepo = os.getenv('IS_MAIN_REPO') == 'true'
+ isCoreRepo = os.getenv('IS_CORE_REPO') == 'true'
isRelease = os.getenv('IS_RELEASE') == 'true'
managerVersion = os.getenv('MANAGER_VERSION')
version = os.getenv('VERSION')
@@ -352,7 +355,7 @@ jobs:
if 'npm' in eventConfig['distribute']:
npmPublishTag = eventConfig['distribute']['npm']
- if isMainRepo and ((eventName == "release" and isRelease) or (eventName != "release" and not isRelease)):
+ if isCoreRepo and ((eventName == "release" and isRelease) or (eventName != "release" and not isRelease)):
if dockerPublishTags is not None:
if "$version" in dockerPublishTags:
@@ -391,13 +394,13 @@ jobs:
deployStr += deploy['environment']
deployStr += ":"
if 'managerTag' in deploy:
- if isMainRepo:
+ if isCoreRepo:
deployStr += deploy['managerTag']
else:
# Custom projects manager docker image must match the openremote version from gradle/libs.versions.toml
deployStr += managerVersion
else:
- if isMainRepo:
+ if isCoreRepo:
os.system("echo 'Manager tag not specified so using commit SHA'")
deployStr += managerTagDefault
else:
@@ -412,8 +415,8 @@ jobs:
print(f"Deployments to deploy: {deployStr}")
os.system(f"echo 'deploys={deployStr}' >> $GITHUB_OUTPUT")
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
- MANAGER_VERSION: ${{ steps.is_main_repo.outputs.ref }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
+ MANAGER_VERSION: ${{ steps.is_core_repo.outputs.ref }}
IS_RELEASE: ${{ steps.get-version-details.outputs.is_release }}
VERSION: ${{ steps.get-version-details.outputs.version }}
@@ -425,7 +428,7 @@ jobs:
import sys
repoOwner = os.getenv('GITHUB_REPOSITORY_OWNER')
- isMainRepo = os.getenv('IS_MAIN_REPO') == 'true'
+ isCoreRepo = os.getenv('IS_CORE_REPO') == 'true'
deployments = os.getenv('DEPLOYMENTS')
eventName = os.getenv('GITHUB_EVENT_NAME')
refType = os.getenv('GITHUB_REF_TYPE')
@@ -434,7 +437,7 @@ jobs:
managerVersion = os.getenv('MANAGER_VERSION')
if eventName == 'workflow_dispatch' and refType != 'tag' and repoOwner == 'openremote':
- if isMainRepo:
+ if isCoreRepo:
tag=inputTag
if not inputTag:
tag='#ref'
@@ -442,7 +445,7 @@ jobs:
tag=managerVersion
deployments=f'{inputEnv}:{tag}'
- if not isMainRepo:
+ if not isCoreRepo:
if "-SNAPSHOT" in deployments:
os.system("echo 'SNAPSHOT manager docker images not currently supported for custom project deployment'")
sys.exit(1)
@@ -455,8 +458,8 @@ jobs:
else:
os.system(f"echo 'pushSnapshot={pushSnapshot}' >> $GITHUB_OUTPUT")
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
- MANAGER_VERSION: ${{ steps.is_main_repo.outputs.ref }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
+ MANAGER_VERSION: ${{ steps.is_core_repo.outputs.ref }}
DEPLOYMENTS: ${{ steps.ci-cd-output.outputs.deploys }}
INPUT_ENVIRONMENT: ${{ steps.process-inputs.outputs.ENVIRONMENT }}
INPUT_MANAGER_TAG: ${{steps.process-inputs.outputs.MANAGER_TAG }}
@@ -478,7 +481,7 @@ jobs:
- name: Define manager docker build command
id: manager-docker-command
- if: ${{ steps.is_main_repo.outputs.value == 'true' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'true' }}
shell: bash
run: |
buildPath="manager/build/install/manager"
@@ -627,9 +630,9 @@ jobs:
echo "************** INFO *******************"
echo "************************************************************"
echo 'Trigger event: ${{ github.event_name }}'
- echo 'Is main repo: ${{ steps.is_main_repo.outputs.value == 'true' }}'
+ echo 'Is core repo: ${{ steps.is_core_repo.outputs.value == 'true' }}'
echo 'Has deployment dockerfile: ${{ steps.check_deployment_dockerfile.outputs.files_exists == 'true' }}'
- echo 'OpenRemote version: ${{ steps.is_main_repo.outputs.ref }}'
+ echo 'OpenRemote version: ${{ steps.is_core_repo.outputs.ref }}'
echo 'Manager commit SHA: ${{ steps.manager-docker-command.outputs.refTag }}'
echo 'Deployment commit SHA: ${{ steps.deployment-docker-command.outputs.refTag }}'
echo 'Deployments: ${{ steps.deployments.outputs.value }}'
@@ -701,7 +704,7 @@ jobs:
run: ./gradlew spotlessUiCheck
- name: Check for outdated translations
- if: steps.is_main_repo.outputs.value == 'true'
+ if: steps.is_core_repo.outputs.value == 'true'
run: |
set -e
@@ -739,14 +742,14 @@ jobs:
- name: Generate backend test reports
id: backend-test-reports
run: |
- if [ "$IS_MAIN" = "true" ]; then
+ if [ "$IS_CORE_REPO" = "true" ]; then
./gradlew unitTestReport combinedCoverageReport -x test
echo "coverage=build/reports/jacoco/combinedCoverageReport/html" >> $GITHUB_OUTPUT
else
echo "coverage=test/build/reports/jacoco/test/html" >> $GITHUB_OUTPUT
fi
env:
- IS_MAIN: ${{ steps.is_main_repo.outputs.value }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
- name: Archive integration test results
if: always()
@@ -756,7 +759,7 @@ jobs:
path: test/build/reports/tests/test
- name: Archive unit test results
- if: ${{ steps.is_main_repo.outputs.value == 'true' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'true' }}
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: unit-test-results
@@ -782,17 +785,17 @@ jobs:
timeout-minutes: 20
- name: Run NPM publish dry run
- if: steps.is_main_repo.outputs.value == 'true' && github.ref != 'refs/heads/master'
+ if: steps.is_core_repo.outputs.value == 'true' && github.ref != 'refs/heads/main'
run: yarn workspaces foreach --all --no-private --topological npm publish --dry-run
timeout-minutes: 20
- name: Run install playwright browser(s)
- if: (steps.test-ui-components-command.outputs.value != '' || steps.test-ui-apps-command.outputs.value != '') && steps.is_main_repo.outputs.value == 'true'
+ if: (steps.test-ui-components-command.outputs.value != '' || steps.test-ui-apps-command.outputs.value != '') && steps.is_core_repo.outputs.value == 'true'
run: npx playwright install chromium-headless-shell
timeout-minutes: 20
- name: Run UI component tests
- if: steps.test-ui-components-command.outputs.value != '' && steps.is_main_repo.outputs.value == 'true'
+ if: steps.test-ui-components-command.outputs.value != '' && steps.is_core_repo.outputs.value == 'true'
run: ${{ steps.test-ui-components-command.outputs.value }}
timeout-minutes: 20
# continue-on-error: true
@@ -807,7 +810,7 @@ jobs:
- name: Run UI app tests
id: run-ui-app-tests
# Skip UI app tests for custom projects until we want to use them there
- if: steps.test-ui-apps-command.outputs.value != '' && steps.is_main_repo.outputs.value == 'true'
+ if: steps.test-ui-apps-command.outputs.value != '' && steps.is_core_repo.outputs.value == 'true'
run: |
composeProfile='profile/dev-testing.yml'
@@ -821,7 +824,7 @@ jobs:
# Run the tests
${{ steps.test-ui-apps-command.outputs.value }}
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
MANAGER_TAG: ${{ steps.manager-docker-command.outputs.refTag }}
timeout-minutes: 20
# continue-on-error: true
@@ -911,7 +914,7 @@ jobs:
deployments = deployments.split(";")
managerRef = os.getenv("MANAGER_REF")
deploymentRef = os.getenv("DEPLOYMENT_REF")
- isMainRepo = os.getenv("IS_MAIN_REPO") == 'true'
+ isCoreRepo = os.getenv("IS_CORE_REPO") == 'true'
inputs = json.loads(os.getenv("INPUTS", "{}"))
secrets = json.loads(os.getenv("SECRETS", "{}"))
inputsAndSecrets = secrets | inputs
@@ -928,8 +931,8 @@ jobs:
# Determine deploy script to use
deployScript = ".ci_cd/deploy.sh"
- if not os.path.exists(deployScript) and not isMainRepo:
- deployScript = "openremote/.ci_cd/deploy.sh"
+ if not os.path.exists(deployScript) and not isCoreRepo:
+ deployScript = "core/.ci_cd/deploy.sh"
if not os.path.exists(deployScript):
os.system(f"Deploy script not found '{deployScript}'")
@@ -1027,7 +1030,8 @@ jobs:
os.system("echo 'One or more deployments failed'")
sys.exit(1)
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
+ IS_MAIN_REPO: ${{ steps.is_core_repo.outputs.value }} # Compatibility with released scripts
DEPLOYMENTS: ${{ steps.deployments.outputs.value }}
BUILDX_BUILDER: ${{ steps.buildx.outputs.name }}
MANAGER_DOCKER_BUILD_PATH: ${{ steps.manager-docker-command.outputs.buildPath }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 824733b3e..9600ae61d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -32,21 +32,21 @@ concurrency:
cancel-in-progress: true
jobs:
- is-main-repo:
- name: Is main repository
+ is-core-repo:
+ name: Is core repository
runs-on: ubuntu-latest
outputs:
- value: ${{ steps.is_main_repo.outputs.value }}
+ value: ${{ steps.is_core_repo.outputs.value }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Check if main repo
- id: is_main_repo
- uses: openremote/openremote/.github/actions/check-if-main-repo@5beec5454f28eda1dd25331c9ce1d5b430266f7e
+ - name: Check if core repo
+ id: is_core_repo
+ uses: openremote/core/.github/actions/check-if-core-repo@357f1387fbc99e7a59752a62064f0bdade57612d
install-dist:
name: Build
- needs: is-main-repo
- if: ${{ needs.is-main-repo.outputs.value == 'true' }}
+ needs: is-core-repo
+ if: ${{ needs.is-core-repo.outputs.value == 'true' }}
uses: "./.github/workflows/install-dist.yml"
with:
COMMIT: ${{ inputs.COMMIT }}
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 727238061..9cd34d3d4 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -20,30 +20,28 @@ jobs:
- name: Get version details
id: get-version-details
- uses: openremote/openremote/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
+ uses: openremote/core/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
- - name: Check if main repo
- id: is_main_repo
- uses: openremote/openremote/.github/actions/check-if-main-repo@5beec5454f28eda1dd25331c9ce1d5b430266f7e
+ - name: Check if core repo
+ id: is_core_repo
+ uses: openremote/core/.github/actions/check-if-core-repo@357f1387fbc99e7a59752a62064f0bdade57612d
- - name: Checkout main repo
+ - name: Checkout core repo
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- if: ${{ steps.is_main_repo.outputs.value == 'false' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'false' }}
with:
- repository: ${{ steps.is_main_repo.outputs.repository }}
- path: openremote
- ref: ${{ steps.is_main_repo.outputs.version }}
- sparse-checkout: |
- .ci_cd
- profile
+ repository: ${{ steps.is_core_repo.outputs.repository }}
+ path: core
+ ref: ${{ steps.is_core_repo.outputs.version }}
+ sparse-checkout: .ci_cd
sparse-checkout-cone-mode: false
- name: Process ci_cd.json file
id: ci-cd-output
- uses: openremote/openremote/.github/actions/process-cicd-json@9ea22e19db6711afd711f39517fe25509b018803
+ uses: openremote/core/.github/actions/process-cicd-json@357f1387fbc99e7a59752a62064f0bdade57612d
with:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
- MANAGER_VERSION: ${{ steps.is_main_repo.outputs.version }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
+ MANAGER_VERSION: ${{ steps.is_core_repo.outputs.version }}
IS_RELEASE: ${{ steps.get-version-details.outputs.is_release }}
VERSION: ${{ steps.get-version-details.outputs.version }}
@@ -62,7 +60,7 @@ jobs:
- name: Download manager build directory
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- if: ${{ steps.is_main_repo.outputs.value == 'true' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'true' }}
with:
name: or-manager-build
path: manager/build
@@ -163,7 +161,7 @@ jobs:
import sys
repoOwner = os.getenv('GITHUB_REPOSITORY_OWNER')
- isMainRepo = os.getenv('IS_MAIN_REPO') == 'true'
+ isCoreRepo = os.getenv('IS_CORE_REPO') == 'true'
deployments = os.getenv('DEPLOYMENTS')
eventName = os.getenv('GITHUB_EVENT_NAME')
refType = os.getenv('GITHUB_REF_TYPE')
@@ -172,7 +170,7 @@ jobs:
managerVersion = os.getenv('MANAGER_VERSION')
if eventName == 'workflow_dispatch' and refType != 'tag' and repoOwner == 'openremote':
- if isMainRepo:
+ if isCoreRepo:
tag=inputTag
if not inputTag:
tag='#ref'
@@ -180,14 +178,14 @@ jobs:
tag=managerVersion
deployments=f'{inputEnv}:{tag}'
- if not isMainRepo:
+ if not isCoreRepo:
if "-SNAPSHOT" in deployments:
os.system("echo 'SNAPSHOT manager docker images not currently supported for custom project deployment'")
sys.exit(1)
os.system(f"echo 'value={deployments}' >> $GITHUB_OUTPUT")
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
- MANAGER_VERSION: ${{ steps.is_main_repo.outputs.version }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
+ MANAGER_VERSION: ${{ steps.is_core_repo.outputs.version }}
DEPLOYMENTS: ${{ steps.ci-cd-output.outputs.deploys }}
INPUT_ENVIRONMENT: ${{ steps.process-inputs.outputs.ENVIRONMENT }}
INPUT_MANAGER_TAG: ${{ steps.process-inputs.outputs.MANAGER_TAG }}
@@ -210,7 +208,7 @@ jobs:
deployments = deployments.split(";")
managerRef = os.getenv("MANAGER_REF")
deploymentRef = os.getenv("DEPLOYMENT_REF")
- isMainRepo = os.getenv("IS_MAIN_REPO") == 'true'
+ isCoreRepo = os.getenv("IS_CORE_REPO") == 'true'
inputs = json.loads(os.getenv("INPUTS", "{}"))
secrets = json.loads(os.getenv("SECRETS", "{}"))
inputsAndSecrets = secrets | inputs
@@ -227,8 +225,8 @@ jobs:
# Determine deploy script to use
deployScript = ".ci_cd/deploy.sh"
- if not os.path.exists(deployScript) and not isMainRepo:
- deployScript = "openremote/.ci_cd/deploy.sh"
+ if not os.path.exists(deployScript) and not isCoreRepo:
+ deployScript = "core/.ci_cd/deploy.sh"
if not os.path.exists(deployScript):
os.system(f"Deploy script not found '{deployScript}'")
@@ -326,7 +324,7 @@ jobs:
os.system("echo 'One or more deployments failed'")
sys.exit(1)
env:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }}
DEPLOYMENTS: ${{ steps.deployments.outputs.value }}
BUILDX_BUILDER: ${{ steps.buildx.outputs.name }}
MANAGER_DOCKER_BUILD_PATH: manager/build/install/manager
diff --git a/.github/workflows/install-dist.yml b/.github/workflows/install-dist.yml
index 3c9c541bb..24e3f8971 100644
--- a/.github/workflows/install-dist.yml
+++ b/.github/workflows/install-dist.yml
@@ -30,9 +30,9 @@ jobs:
ref: ${{ inputs.COMMIT }}
lfs: true # Enable Git LFS plugin to fetch *.mbtiles
- - name: Check if main repo
- id: is_main_repo
- uses: openremote/openremote/.github/actions/check-if-main-repo@5beec5454f28eda1dd25331c9ce1d5b430266f7e
+ - name: Check if core repo
+ id: is_core_repo
+ uses: openremote/core/.github/actions/check-if-core-repo@357f1387fbc99e7a59752a62064f0bdade57612d
- name: Set up JDK 21 and Gradle cache
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
@@ -119,7 +119,7 @@ jobs:
- name: Archive MDI fonts
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
- if: ${{ steps.is_main_repo.outputs.value == 'true' }}
+ if: ${{ steps.is_core_repo.outputs.value == 'true' }}
with:
name: mdi-fonts
if-no-files-found: error
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 113a7f3ed..ace8382fd 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -5,7 +5,7 @@ on:
merge_group:
types: [checks_requested]
branches:
- - master
+ - main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
@@ -188,4 +188,4 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Get version details
id: get-version-details
- uses: openremote/openremote/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
+ uses: openremote/core/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index e9b7d0e69..e89711e3a 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -2,7 +2,7 @@ name: Staging
on:
push:
- branches: [master]
+ branches: [main]
tags:
- "[0-9]+.[0-9]+.[0-9]+"
@@ -77,18 +77,18 @@ jobs:
- name: Get version details
id: get-version-details
- uses: openremote/openremote/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
+ uses: openremote/core/.github/actions/get-version-details@3cde448ab3d2e825e7ab189881d0e6cf33a34486
- - name: Check if main repo
- id: is_main_repo
- uses: openremote/openremote/.github/actions/check-if-main-repo@5beec5454f28eda1dd25331c9ce1d5b430266f7e
+ - name: Check if core repo
+ id: is_core_repo
+ uses: openremote/core/.github/actions/check-if-core-repo@357f1387fbc99e7a59752a62064f0bdade57612d
- name: Process ci_cd.json file
id: ci-cd-output
- uses: openremote/openremote/.github/actions/process-cicd-json@9ea22e19db6711afd711f39517fe25509b018803
+ uses: openremote/core/.github/actions/process-cicd-json@357f1387fbc99e7a59752a62064f0bdade57612d
with:
- IS_MAIN_REPO: ${{ steps.is_main_repo.outputs.value }} # Shouldn't be needed in this context
- MANAGER_VERSION: ${{ steps.is_main_repo.outputs.version }}
+ IS_CORE_REPO: ${{ steps.is_core_repo.outputs.value }} # Shouldn't be needed in this context
+ MANAGER_VERSION: ${{ steps.is_core_repo.outputs.version }}
IS_RELEASE: ${{ steps.get-version-details.outputs.is_release }}
VERSION: ${{ steps.get-version-details.outputs.version }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 07397ac1f..4b2ea6b90 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -22,14 +22,14 @@ jobs:
java-version: "21"
cache: "gradle"
- - name: Check if main repo
- id: is_main_repo
- uses: openremote/openremote/.github/actions/check-if-main-repo@5beec5454f28eda1dd25331c9ce1d5b430266f7e
+ - name: Check if core repo
+ id: is_core_repo
+ uses: openremote/core/.github/actions/check-if-core-repo@357f1387fbc99e7a59752a62064f0bdade57612d
- name: Run unit tests
timeout-minutes: 20
run: |
- if [ "${{ steps.is_main_repo.outputs.value }}" = "true" ]; then
+ if [ "${{ steps.is_core_repo.outputs.value }}" = "true" ]; then
./gradlew test -x :test:test -x npmTest unitTestReport
else
./gradlew test -x :test:test
diff --git a/README.md b/README.md
index 46e9cb99d..693b2042c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# OpenRemote
+# OpenRemote Core
-[![CI/CD](https://github.com/openremote/openremote/actions/workflows/ci_cd.yml/badge.svg?branch=master&event=push)](https://github.com/openremote/openremote/actions/workflows/ci_cd.yml?query=event%3Apush+branch%3Amaster)
+[![CI/CD](https://github.com/openremote/core/actions/workflows/ci_cd.yml/badge.svg?branch=main&event=push)](https://github.com/openremote/core/actions/workflows/ci_cd.yml?query=event%3Apush+branch%3Amain)
[![Open Source? Yes!](https://badgen.net/badge/Open%20Source%20%3F/Yes%21/blue?icon=github)](https://github.com/Naereen/badges/)
-<!-- ![tests](https://github.com/openremote/openremote/workflows/tests/badge.svg) -->
+<!-- ![tests](https://github.com/openremote/core/workflows/tests/badge.svg) -->
-[Source](https://github.com/openremote/openremote) **·** [Documentation](https://docs.openremote.io) **·** [Forum](https://forum.openremote.io) **·** [Issues](https://github.com/openremote/openremote/issues) **·** [Docker Images](https://hub.docker.com/u/openremote/) **·** [OpenRemote Inc.](https://openremote.io)
+[Source](https://github.com/openremote/core) **·** [Documentation](https://docs.openremote.io) **·** [Forum](https://forum.openremote.io) **·** [Issues](https://github.com/openremote/core/issues) **·** [Docker Images](https://hub.docker.com/u/openremote/) **·** [OpenRemote Inc.](https://openremote.io)
Welcome to OpenRemote; an intuitive user-friendly 100% open source IoT platform. You can build a complete IoT device management solution including: device management and auto provisioning, customisation of asset types, automation via when-then, flow, javascript and groovy rules, data analytics, connectivity via several protocol agents and manager APIs (e.g. MQTT broker, HTTP/REST, WS), Multi-tenancy (realms), Users and roles management, Edge gateway, Front-end UI web components and consoles, and an Insights dashboard builder.
@@ -22,7 +22,7 @@ The quickest way to get your own environment with full access is to make use of
1. Make sure you have [Docker Desktop](https://www.docker.com/products/docker-desktop) installed (v18+).
2. Download the docker compose file:
- [OpenRemote Stack](https://raw.githubusercontent.com/openremote/openremote/master/docker-compose.yml) (Right click 'Save link as...')
+ [OpenRemote Stack](https://raw.githubusercontent.com/openremote/core/main/docker-compose.yml) (Right click 'Save link as...')
3. In a terminal `cd` to where you just saved the compose file and then run:
```
diff --git a/SECURITY.md b/SECURITY.md
index e5a8e80bc..58ee8f1de 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -30,7 +30,7 @@ The rule of thumb is whether one change would fix everything you are describing.
To report through email send an email to [email protected]
-To report through GitHub go to [https://github.com/openremote/openremote/security/advisories/new](https://github.com/openremote/openremote/security/advisories/new)
+To report through GitHub go to [https://github.com/openremote/core/security/advisories/new](https://github.com/openremote/core/security/advisories/new)
If you have a patch for the issue please use `git format-patch` and attach to the email or issue. Please do not open a
pull request on GitHub as that may disclose sensitive details around the vulnerability.
diff --git a/agent/build.gradle b/agent/build.gradle
index 325c2117e..45f521a9b 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -121,7 +121,7 @@ publishing {
pom {
name = 'OpenRemote Agent'
description = 'Provides agent SPI and built in agents; add maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -138,9 +138,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/build.gradle b/build.gradle
index 364684fd4..89c3ccf48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -193,7 +193,7 @@ tasks.register('combinedCoverageReport', JacocoReport) {
// Configure version based on Git tags
scmVersion {
releaseOnlyOnReleaseBranches = true
- releaseBranchNames = ['main', 'master']
+ releaseBranchNames = ['main']
unshallowRepoOnCI.set(true)
versionCreator('simple')
versionIncrementer('incrementMinor')
diff --git a/container/build.gradle b/container/build.gradle
index e13161d16..55b987708 100644
--- a/container/build.gradle
+++ b/container/build.gradle
@@ -83,7 +83,7 @@ publishing {
pom {
name = 'OpenRemote Container'
description = 'Application container for running; add maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -100,9 +100,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/container/src/main/java/org/openremote/container/security/TokenVerifierImpl.java b/container/src/main/java/org/openremote/container/security/TokenVerifierImpl.java
index db7ac4446..1b4caac74 100644
--- a/container/src/main/java/org/openremote/container/security/TokenVerifierImpl.java
+++ b/container/src/main/java/org/openremote/container/security/TokenVerifierImpl.java
@@ -106,7 +106,7 @@ public class TokenVerifierImpl implements TokenVerifier {
// Fall back to aud - service users put the client in the aud claim not the azp claim
if (claims.getAudience() == null || !claims.getAudience().contains(expectedClientId)) {
- // TODO: Remove this once https://github.com/openremote/openremote/issues/2642 is
+ // TODO: Remove this once https://github.com/openremote/core/issues/2642 is
// implemented
try {
String preferredUsername = claims.getStringClaim("preferred_username");
diff --git a/kubernetes/README.md b/kubernetes/README.md
index adbebf8bb..4bd3d32f0 100644
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -85,7 +85,7 @@ Look at the commented `resources` section in the values files and provide actual
Some configuration information (e.g. the database name) is duplicated between the values files of the different charts.
This is a conscious decision at this time to keep the charts independent.
-We'll be looking into improving on this in the future ([Have a mechanism to deploy the complete OR stack in a single operation · Issue #1651 · openremote/openremote](https://github.com/openremote/openremote/issues/1651))
+We'll be looking into improving on this in the future ([Have a mechanism to deploy the complete OR stack in a single operation · Issue #1651 · openremote/core](https://github.com/openremote/core/issues/1651))
That being said, we are using a single Opaque secret to contain all secure information applicable to all charts instead of multiple kubernetes.io/basic-auth secrets for individual credentials.
diff --git a/manager/build.gradle b/manager/build.gradle
index 2b91019d2..c980838d5 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -183,7 +183,7 @@ publishing {
pom {
name = 'OpenRemote Manager'
description = 'Provides core container services and is the main component of the OpenRemote backend; add maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -200,9 +200,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java
index 3bac95150..5eee2ca68 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java
@@ -102,7 +102,7 @@ public class ActiveMQORSecurityManager implements ActiveMQSecurityManager5 {
try {
// TODO: Add support for bearer token authentication
- // https://github.com/openremote/openremote/issues/2534
+ // https://github.com/openremote/core/issues/2534
// Login service user
if (user != null) {
int delimIndex = user.indexOf(':');
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index 270161f97..e3fcffbe7 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -87,7 +87,7 @@ public class RulesetDeployment {
*/
groovyShell =
new GroovyShell(
- // See https://github.com/openremote/openremote/issues/2843, can't use
+ // See https://github.com/openremote/core/issues/2843, can't use
// SandboxTransformer until it's Groovy 5 compatible
// new CompilerConfiguration().addCompilationCustomizers(new
// SandboxTransformer())
diff --git a/model-util/build.gradle b/model-util/build.gradle
index a38b4037f..2fd103a86 100644
--- a/model-util/build.gradle
+++ b/model-util/build.gradle
@@ -41,7 +41,7 @@ publishing {
pom {
name = 'OpenRemote Model Util'
description = 'Provides utilities for building the typescript model used within OpenRemote and custom projects'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -58,9 +58,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/model/build.gradle b/model/build.gradle
index 332a3d659..1e6e693ac 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -85,7 +85,7 @@ publishing {
pom {
name = 'OpenRemote Model'
description = 'Provides core model classes used within OpenRemote; add maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -102,9 +102,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/test/build.gradle b/test/build.gradle
index f95689e59..784ab0c6b 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -70,7 +70,7 @@ publishing {
pom {
name = 'OpenRemote Test Fixtures'
description = 'Provides test fixtures for writing backend integration tests; add maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -87,9 +87,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/test/load2-eks/README.md b/test/load2-eks/README.md
index 9c5583cce..01d968f55 100644
--- a/test/load2-eks/README.md
+++ b/test/load2-eks/README.md
@@ -181,7 +181,7 @@ MILLIS_BETWEEN_PUBLISHES: Delay between each publishing iteration. Default is 30
## Multi-proxy test
-As part of [Test using multiple HAProxy replicas under EKS · Issue #2568 · openremote/openremote](https://github.com/openremote/openremote/issues/2568),
+As part of [Test using multiple HAProxy replicas under EKS · Issue #2568 · openremote/core](https://github.com/openremote/core/issues/2568),
a setup terminating TLS at the AWS NLB level and using ACM to manage certificates, while still using HAProxy pod(s) has been implemented.
This can be installed using the `eks-setup-load-acm.sh` script.
This is really for testing purposes and clarification on how we deploy our stack is required to move further.
diff --git a/test/src/test/groovy/org/openremote/test/rules/RulesEngineFiringTest.groovy b/test/src/test/groovy/org/openremote/test/rules/RulesEngineFiringTest.groovy
index 6b37e46d4..5568f435d 100644
--- a/test/src/test/groovy/org/openremote/test/rules/RulesEngineFiringTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/RulesEngineFiringTest.groovy
@@ -47,7 +47,7 @@ import static org.openremote.model.rules.Ruleset.Lang.GROOVY
class RulesEngineFiringTest extends Specification implements ManagerContainerTrait {
/*
- * See https://github.com/openremote/openremote/issues/1953
+ * See https://github.com/openremote/core/issues/1953
* When rules evaluation takes longer than the firing period AND an attribute event occurs during that time,
* the rules engine would fire even if rules where still being evaluated.
*/
diff --git a/ui/app/insights/build.gradle b/ui/app/insights/build.gradle
index 823e7544a..bf82a3d15 100644
--- a/ui/app/insights/build.gradle
+++ b/ui/app/insights/build.gradle
@@ -28,7 +28,7 @@ publishing {
pom {
name = 'OpenRemote Manager UI'
description = 'Provides the UI for OpenRemote Insight dashboards'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -45,9 +45,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/ui/app/manager/build.gradle b/ui/app/manager/build.gradle
index 61812c405..ec49e46cc 100644
--- a/ui/app/manager/build.gradle
+++ b/ui/app/manager/build.gradle
@@ -28,7 +28,7 @@ publishing {
pom {
name = 'OpenRemote Manager UI'
description = 'Provides the UI for the OpenRemote Manager'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -45,9 +45,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/ui/app/shared/build.gradle b/ui/app/shared/build.gradle
index 167d0872d..13df66f38 100644
--- a/ui/app/shared/build.gradle
+++ b/ui/app/shared/build.gradle
@@ -32,7 +32,7 @@ publishing {
pom {
name = 'OpenRemote Shared UI Files'
description = 'Provides the files shared between OpenRemote UIs'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -49,9 +49,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/ui/app/swagger/build.gradle b/ui/app/swagger/build.gradle
index d3be5df9f..010305793 100644
--- a/ui/app/swagger/build.gradle
+++ b/ui/app/swagger/build.gradle
@@ -36,7 +36,7 @@ publishing {
pom {
name = 'OpenRemote Swagger UI'
description = 'Provides a Swagger UI configured for use with OpenRemote'
- url = 'https://github.com/openremote/openremote'
+ url = 'https://github.com/openremote/core'
licenses {
license {
name = 'GNU Affero General Public License v3.0'
@@ -53,9 +53,9 @@ publishing {
}
}
scm {
- connection = 'scm:git:git://github.com/openremote/openremote.git'
- developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'
- url = 'https://github.com/openremote/openremote/tree/master'
+ connection = 'scm:git:git://github.com/openremote/core.git'
+ developerConnection = 'scm:git:ssh://github.com:openremote/core.git'
+ url = 'https://github.com/openremote/core/tree/main'
}
}
}
diff --git a/ui/component/README.md b/ui/component/README.md
index e8e55a8da..cb98c773f 100644
--- a/ui/component/README.md
+++ b/ui/component/README.md
@@ -2,7 +2,7 @@
Library of UI components that can be used to build web applications that communicate with an OpenRemote Manager.
-[Source](https://github.com/openremote/openremote) **·** [Documentation](https://docs.openremote.io) **·** [Community](https://forum.openremote.io) **·** [Issues](https://github.com/openremote/openremote/issues) **·** [Docker Images](https://hub.docker.com/u/openremote/) **·** [OpenRemote Inc.](https://openremote.io)
+[Source](https://github.com/openremote/core) **·** [Documentation](https://docs.openremote.io) **·** [Community](https://forum.openremote.io) **·** [Issues](https://github.com/openremote/core/issues) **·** [Docker Images](https://hub.docker.com/u/openremote/) **·** [OpenRemote Inc.](https://openremote.io)
## Contributing
diff --git a/ui/component/core/src/console.ts b/ui/component/core/src/console.ts
index 510d387fa..59088381b 100644
--- a/ui/component/core/src/console.ts
+++ b/ui/component/core/src/console.ts
@@ -463,7 +463,7 @@ export class Console {
/**
* Function that allows sending of custom types and messages towards the console.
- * TODO: Will be improved in the future, see this GitHub issue; https://github.com/openremote/openremote/issues/1318
+ * TODO: Will be improved in the future, see this GitHub issue; https://github.com/openremote/core/issues/1318
*/
public _doSendGenericMessage(type: string, msg: any) {
const payload = { type, data: msg };
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 88acf9770..6c73e026d 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -843,7 +843,7 @@ function getPanelContent(
const attributePickerModalOpen = () => {
const newlySelectedAttributes = [...selectedAttributes];
- // TODO: Replace with or-vaadin-dialog, see https://github.com/openremote/openremote/issues/2594
+ // TODO: Replace with or-vaadin-dialog, see https://github.com/openremote/core/issues/2594
showOkCancelDialog(
i18next.t("addRemoveAttributes"),
html`
diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.json
index 47540c3af..7bdaed335 100644
--- a/ui/component/or-chart/package.json
+++ b/ui/component/or-chart/package.json
@@ -25,7 +25,7 @@
"prepack": "npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@material/data-table": "^9.0.0",
diff --git a/ui/component/or-element/package.json b/ui/component/or-element/package.json
index faedf004f..cbe85780b 100644
--- a/ui/component/or-element/package.json
+++ b/ui/component/or-element/package.json
@@ -19,7 +19,7 @@
},
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"dependencies": {
"lit": "^3.3.1"
},
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index 29df79392..f23c06f3d 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -26,7 +26,7 @@
"prepack": "npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/core": "workspace:*",
diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.json
index de762a5a7..27595c8d6 100644
--- a/ui/component/or-mwc-components/package.json
+++ b/ui/component/or-mwc-components/package.json
@@ -32,7 +32,7 @@
"prepack": "npx tsc -b && npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@material/base": "^9.0.0",
diff --git a/ui/component/or-rive-renderer/package.json b/ui/component/or-rive-renderer/package.json
index 36fb3243b..4c0d76c97 100644
--- a/ui/component/or-rive-renderer/package.json
+++ b/ui/component/or-rive-renderer/package.json
@@ -23,7 +23,7 @@
"prepack": "npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/or-element": "workspace:*",
diff --git a/ui/component/or-scheduler/package.json b/ui/component/or-scheduler/package.json
index 37de5a4d7..d85ee0692 100644
--- a/ui/component/or-scheduler/package.json
+++ b/ui/component/or-scheduler/package.json
@@ -23,7 +23,7 @@
},
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"dependencies": {
"@openremote/core": "workspace:*",
"@openremote/model": "workspace:*",
diff --git a/ui/component/or-translate/package.json b/ui/component/or-translate/package.json
index 629db7891..e2ac2938e 100644
--- a/ui/component/or-translate/package.json
+++ b/ui/component/or-translate/package.json
@@ -26,7 +26,7 @@
"prepack": "npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/or-element": "workspace:*",
diff --git a/ui/component/or-tree-menu/package.json b/ui/component/or-tree-menu/package.json
index 01f404fe7..bac2e4d94 100644
--- a/ui/component/or-tree-menu/package.json
+++ b/ui/component/or-tree-menu/package.json
@@ -25,7 +25,7 @@
"prepack": "npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/core": "workspace:*",
diff --git a/ui/component/or-vaadin-components/package.json b/ui/component/or-vaadin-components/package.json
index d481befdd..426fcc4af 100644
--- a/ui/component/or-vaadin-components/package.json
+++ b/ui/component/or-vaadin-components/package.json
@@ -32,7 +32,7 @@
"prepack": "npx tsc -b && npx rspack"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/core": "workspace:*",
diff --git a/ui/component/theme/package.json b/ui/component/theme/package.json
index 135b89811..144a8bcc0 100644
--- a/ui/component/theme/package.json
+++ b/ui/component/theme/package.json
@@ -19,7 +19,7 @@
"test": "echo \"No tests\" && exit 0"
},
"author": "OpenRemote",
- "repository": "https://github.com/openremote/openremote",
+ "repository": "https://github.com/openremote/core",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@vaadin/vaadin-lumo-styles": "~25.3.2",
diff --git a/ui/demo/demo-core/README.md b/ui/demo/demo-core/README.md
index 8fcaed684..a4eab5da8 100644
--- a/ui/demo/demo-core/README.md
+++ b/ui/demo/demo-core/README.md
@@ -1,7 +1,7 @@
# demo-core
Provides a very basic app intended as a development harness for
-To run the demo you must have a running OpenRemote Manager backend with Demo assets (see [Quickstart](https://github.com/openremote/openremote/blob/master/README.md#quickstart)).
+To run the demo you must have a running OpenRemote Manager backend with Demo assets (see [Quickstart](https://github.com/openremote/core/blob/main/README.md#quickstart)).
## Supported Browsers