diff --git a/.github/actions/deploy-artifact-artifactory/action.yml b/.github/actions/deploy-artifact-artifactory/action.yml index 574efa595018..9736c1e03a28 100644 --- a/.github/actions/deploy-artifact-artifactory/action.yml +++ b/.github/actions/deploy-artifact-artifactory/action.yml @@ -68,7 +68,7 @@ runs: - name: 'Maven settings.xml setup' uses: whelk-io/maven-settings-xml-action@v22 with: - servers: '[{ "id": "dotcms-libs", "username": "${{ inputs.artifactory-repo-username }}", "password": "${{ inputs.artifactory-repo-password }}" }, { "id": "dotcms-libs-snapshot", "username": "${{ inputs.artifactory-repo-username }}", "password": "${{ inputs.artifactory-repo-password }}" }]' + servers: '[{ "id": "dotcms-libs-local", "username": "${{ inputs.artifactory-repo-username }}", "password": "${{ inputs.artifactory-repo-password }}" }, { "id": "dotcms-libs-snapshot-local", "username": "${{ inputs.artifactory-repo-username }}", "password": "${{ inputs.artifactory-repo-password }}" }]' # Artifact deployment in the Artifactory excluding 'dotcms-integration' and 'dotcms-postman' - name: 'Deploy Artifacts' diff --git a/.github/workflows/maven-release-process.yml b/.github/workflows/maven-release-process.yml index 5efcff17b3e8..c320a8cda085 100644 --- a/.github/workflows/maven-release-process.yml +++ b/.github/workflows/maven-release-process.yml @@ -273,8 +273,7 @@ jobs: - name: maven-settings-xml-action uses: whelk-io/maven-settings-xml-action@v20 with: - repositories: '[{ "id": "dotcms-libs", "name": "DotCMS libs Release", "url": "https://repo.dotcms.com/artifactory/libs-release" }]' - servers: '[{ "id": "dotcms-libs", "username": "${{ secrets.EE_REPO_USERNAME }}", "password": "${{ secrets.EE_REPO_PASSWORD }}" }]' + servers: '[{ "id": "dotcms-libs-local", "username": "${{ secrets.EE_REPO_USERNAME }}", "password": "${{ secrets.EE_REPO_PASSWORD }}" }]' - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/dotcms-integration/pom.xml b/dotcms-integration/pom.xml index 3ae855a609e6..b9cab94ba347 100644 --- a/dotcms-integration/pom.xml +++ b/dotcms-integration/pom.xml @@ -514,28 +514,6 @@ - - - - false - - dotcms-libs - https://repo.dotcms.com/artifactory/libs-release - - - - true - - dotcms-libs-snapshot - https://repo.dotcms.com/artifactory/libs-snapshot-local - - - - false - - jitpack - https://jitpack.io - - + diff --git a/dotcms-postman/pom.xml b/dotcms-postman/pom.xml index b72989d980d2..c4b614086684 100644 --- a/dotcms-postman/pom.xml +++ b/dotcms-postman/pom.xml @@ -146,28 +146,5 @@ - - - - false - - dotcms-libs - https://repo.dotcms.com/artifactory/libs-release - - - - true - - dotcms-libs-snapshot - https://repo.dotcms.com/artifactory/libs-snapshot-local - - - - false - - jitpack - https://jitpack.io - - diff --git a/independent-projects/core-plugins/tika-api/pom.xml b/independent-projects/core-plugins/tika-api/pom.xml index 3f108023f372..b3e7c8520e8b 100644 --- a/independent-projects/core-plugins/tika-api/pom.xml +++ b/independent-projects/core-plugins/tika-api/pom.xml @@ -22,18 +22,6 @@ - - - dotcms-libs - DotCMS libs Release - https://repo.dotcms.com/artifactory/libs-release - - - dotcms-libs-snapshot - IDotCMS libs Snapshots - https://repo.dotcms.com/artifactory/libs-snapshot-local - - diff --git a/osgi-base/system-bundles/pom.xml b/osgi-base/system-bundles/pom.xml index 697de9890db9..ad812e6d050d 100644 --- a/osgi-base/system-bundles/pom.xml +++ b/osgi-base/system-bundles/pom.xml @@ -21,36 +21,6 @@ 2.7.0 - - - - false - - - true - - dotcms-libs - https://repo.dotcms.com/artifactory/libs-release/ - - - - true - never - - - false - - dotcms-libs-snapshot - https://repo.dotcms.com/artifactory/libs-snapshot-local/ - - - - false - - jitpack - https://jitpack.io - - diff --git a/parent/pom.xml b/parent/pom.xml index 2db7365c6b3c..f1d282cec0ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1125,48 +1125,6 @@ GitHub https://github.com/dotCMS/core/issues/ - - - - true - - - false - - dotcms-libs - https://repo.dotcms.com/artifactory/libs-release/ - - - - false - - jitpack - https://jitpack.io - - - - - - false - - dotcms-libs - https://repo.dotcms.com/artifactory/libs-release - - - - true - - dotcms-libs-snapshot - https://repo.dotcms.com/artifactory/libs-snapshot-local - - - - false - - jitpack - https://jitpack.io - - @@ -1664,14 +1622,53 @@ - + + + true + + + false + + dotcms-libs + https://repo.dotcms.com/artifactory/libs-release + + + + false + + + false + + dotcms-libs-snapshot-local + IDotCMS libs Snapshots + https://repo.dotcms.com/artifactory/libs-snapshot-local + + + + + + false + dotcms-libs + https://repo.dotcms.com/artifactory/libs-release + + + + true + + dotcms-libs-snapshot + https://repo.dotcms.com/artifactory/libs-snapshot + + + + + dotcms-libs-local DotCMS libs Release https://repo.dotcms.com/artifactory/libs-release-local - dotcms-libs-snapshot + dotcms-libs-snapshot-local IDotCMS libs Snapshots https://repo.dotcms.com/artifactory/libs-snapshot-local diff --git a/pom.xml b/pom.xml index 9bad829dcde9..e95e4390576b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,16 +40,6 @@ dotcms-libs https://repo.dotcms.com/artifactory/libs-release - - - true - - - false - - jitpack - https://jitpack.io - @@ -57,17 +47,15 @@ file://${project.build.directory}/staging - dotcms-libs + dotcms-libs-local DotCMS libs Release - https://repo.dotcms.com/artifactory/libs-release + https://repo.dotcms.com/artifactory/libs-release-local -