Merge branch 'OES-1.33.x' into feature/OP-22255-OES-upgrade-1.33.x

OpsMx · Jun 24, 2024 · c91cee2 · c91cee2
2 parents 945e328 + 501a628
commit c91cee2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/halyard-oes-branch.yml b/.github/workflows/halyard-oes-branch.yml
@@ -61,10 +61,12 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: |
+             sed  -e 's/NEXUS_URL/${{ secrets.NEXUS_URL }}/'  -i settings.gradle
              sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i settings.gradle
              sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle
              sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle
              sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle
+             sed  -e 's/NEXUS_URL/${{ secrets.NEXUS_URL }}/' -i build.gradle
              
              ./gradlew --no-daemon -PenableCrossCompilerPlugin=true halyard-web:installDist -x test 
 

diff --git a/.github/workflows/halyard-oes.yml b/.github/workflows/halyard-oes.yml
@@ -46,10 +46,12 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: |
-             sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i settings.gradle
-             sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle
-             sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle
-             sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle
+             sed  -e 's|NEXUS_USERNAME|${{ secrets.NEXUS_USERNAME }}|' -i settings.gradle
+             sed  -e 's|NEXUS_PASSWORD|${{ secrets.NEXUS_PASSWORD }}|' -i settings.gradle
+             sed  -e 's|NEXUS_USERNAME|${{ secrets.NEXUS_USERNAME }}|' -i build.gradle
+             sed  -e 's|NEXUS_PASSWORD|${{ secrets.NEXUS_PASSWORD }}|' -i build.gradle
+             sed  -e 's|NEXUS_URL|${{ secrets.NEXUS_URL }}|' -i settings.gradle
+             sed  -e 's|NEXUS_URL|${{ secrets.NEXUS_URL }}|' -i build.gradle
              
              ./gradlew --no-daemon -PenableCrossCompilerPlugin=true halyard-web:installDist -x test 
 

diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ subprojects {
     repositories {
       mavenLocal()
        maven{
-        url "https://nexus.opsmx.net/repository/maven-snapshots/"
+        url "NEXUS_URL"
            credentials {
                     username = "NEXUS_USERNAME"
                     password = "NEXUS_PASSWORD"

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ fiatVersion=1.33.0-SNAPSHOT
 korkVersion=1.33.0-SNAPSHOT
 front50Version=1.33.0-SNAPSHOT
 org.gradle.parallel=true
-spinnakerGradleVersion=1-0-SNAPSHOT
+spinnakerGradleVersion=1.33.0-SNAPSHOT
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.

diff --git a/settings.gradle b/settings.gradle
@@ -21,7 +21,7 @@ if (spinnakerGradleVersion.endsWith('-SNAPSHOT')) {
       mavenCentral()
       gradlePluginPortal()
        maven{
-        url "https://nexus.opsmx.net/repository/maven-snapshots/"
+        url  "NEXUS_URL"
            credentials {
                     username = "NEXUS_USERNAME"
                     password = "NEXUS_PASSWORD"