Skip to content

Commit 3d0947f

Browse files
Fixs the release issue (#1089)
* Fixs the release issue * Downgrade the core-cif-component version in it/site
1 parent 5ec71aa commit 3d0947f

8 files changed

Lines changed: 29 additions & 8 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ jobs:
7979
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
8080
ARTIFACTORY_CLOUD_USER: ${{ secrets.ARTIFACTORY_CLOUD_USER }}
8181
ARTIFACTORY_CLOUD_PASS: ${{ secrets.ARTIFACTORY_CLOUD_PASS }}
82+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
83+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
8284

8385
- name: Clean up secrets
8486
if: always()

it/site/all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.adobe.commerce.cif</groupId>
2424
<artifactId>cif-components-it-site</artifactId>
25-
<version>2.18.7-SNAPSHOT</version>
25+
<version>1.0.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

it/site/pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
</parent>
2626

2727
<artifactId>cif-components-it-site</artifactId>
28-
<version>2.18.7-SNAPSHOT</version>
28+
<!-- Independent version for the it/site test site, deliberately decoupled from the CIF release
29+
version so the profile-gated classic/* modules (which the release plugin never rewrites)
30+
stay consistent. Do not bump this on release. -->
31+
<version>1.0.0-SNAPSHOT</version>
2932
<packaging>pom</packaging>
3033
<name>CIF IT Site</name>
3134
<description>CIF IT Site — integration-test site for AEM CIF Core Components</description>
@@ -460,6 +463,16 @@ Bundle-DocURL:
460463
<version>${core.wcm.components.version}</version>
461464
</dependency>
462465
<!-- CIF Core Components -->
466+
<!-- Compile-time only (the bundle is provided by the AEM runtime, not embedded). Managed
467+
centrally here so the whole it/site test site pins a single CIF Core version. it/site is
468+
a standalone reactor decoupled from the CIF release reactor, so THIS is the one line to
469+
bump when retargeting the test site at a newer CIF Core version. -->
470+
<dependency>
471+
<groupId>com.adobe.commerce.cif</groupId>
472+
<artifactId>core-cif-components-core</artifactId>
473+
<version>2.18.4</version>
474+
<scope>provided</scope>
475+
</dependency>
463476
<!-- CIF SDK API -->
464477
<dependency>
465478
<groupId>com.adobe.aem</groupId>

it/site/ui.apps.structure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.adobe.commerce.cif</groupId>
2525
<artifactId>cif-components-it-site</artifactId>
26-
<version>2.18.7-SNAPSHOT</version>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

it/site/ui.apps/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.adobe.commerce.cif</groupId>
2525
<artifactId>cif-components-it-site</artifactId>
26-
<version>2.18.7-SNAPSHOT</version>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

@@ -133,7 +133,6 @@
133133
<dependency>
134134
<groupId>com.adobe.commerce.cif</groupId>
135135
<artifactId>core-cif-components-core</artifactId>
136-
<version>2.18.7-SNAPSHOT</version>
137136
<scope>provided</scope>
138137
</dependency>
139138
<dependency>

it/site/ui.config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.adobe.commerce.cif</groupId>
2525
<artifactId>cif-components-it-site</artifactId>
26-
<version>2.18.7-SNAPSHOT</version>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

it/site/ui.content/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.adobe.commerce.cif</groupId>
2525
<artifactId>cif-components-it-site</artifactId>
26-
<version>2.18.7-SNAPSHOT</version>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,16 @@
6464
<modules>
6565
<module>it/content</module>
6666
<module>it/http</module>
67-
<module>it/site</module>
6867
<module>ui.tests</module>
6968
</modules>
69+
<!-- it/site is intentionally NOT a reactor module. It builds as its own standalone
70+
reactor (see .github/scripts/it-tests.js) and is versioned independently at
71+
1.0.0-SNAPSHOT. Keeping it out of the reactor stops mvn release:prepare from
72+
bumping its version (autoVersionSubmodules=true would otherwise force it to the
73+
release version and strand the profile-gated it/site/classic/* modules, which the
74+
release plugin never rewrites). Its only coupling to the CIF release is the
75+
provided-scope core-cif-components-core dependency, managed centrally in
76+
it/site/pom.xml and bumped manually when retargeting the test site. -->
7077
</profile>
7178
</profiles>
7279

0 commit comments

Comments
 (0)