anton-vinogradov commented on PR #13257:
URL: https://github.com/apache/ignite/pull/13257#issuecomment-4844528770
Follow-up to my review above — ready-to-apply patch for the three points. I
tried to post these as inline one-click `suggestion` blocks, but all three
touch lines that fall outside this PR's diff hunks (the kubernetes version, the
`update-versions` Ant block, and the relocation target for the CI step), and
GitHub only allows suggestions on changed lines. So here they are as a single
patch you can `git apply` on the branch:
```diff
diff --git a/.github/workflows/commit-check.yml
b/.github/workflows/commit-check.yml
index 72e7f12d466..7605f36a9ac 100644
--- a/.github/workflows/commit-check.yml
+++ b/.github/workflows/commit-check.yml
@@ -99,10 +99,6 @@ jobs:
run: |
./mvnw test-compile
-Pall-java,licenses,lgpl,checkstyle,examples,check-licenses -B -V -T 1C
- - name: Documentation code snippets compilation check
- run: |
- ./mvnw -Pdocs -pl :code-snippets -am compile -B -V
-
- name: Run abandoned tests checks.
# Reuse classes from the previous step; the differing profiles
otherwise trigger a full reactor recompile.
run : |
@@ -112,6 +108,12 @@ jobs:
run : |
./mvnw -DskipTests install -pl modules/tools,modules/codegen -B
-V && ./mvnw initialize -Pjavadoc -B -V
+ # Placed last: it recompiles the upstream modules under the `docs`
profile and must not clobber the
+ # class reuse relied on by the codestyle/abandoned-tests steps above.
+ - name: Documentation code snippets compilation check
+ run: |
+ ./mvnw -Pdocs -pl :code-snippets -am compile -B -V
+
check-dotnet:
name: Сheck .NET code
runs-on: ubuntu-latest
diff --git a/docs/_docs/code-snippets/java/pom.xml
b/docs/_docs/code-snippets/java/pom.xml
index 8d29c53c652..94239e27310 100644
--- a/docs/_docs/code-snippets/java/pom.xml
+++ b/docs/_docs/code-snippets/java/pom.xml
@@ -42,6 +42,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <!-- ignite-jcl is not part of ignite-bom, so the version must
be specified explicitly. -->
<artifactId>ignite-jcl</artifactId>
<version>${ignite.version}</version>
</dependency>
@@ -89,7 +90,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-kubernetes</artifactId>
- <version>${ignite.version}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index da005ab74d9..ea2d5a66e04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,14 +513,6 @@
<target>
<echo message="Update
ignite.version in docs" />
- <replaceregexp byline="true"
encoding="UTF-8">
- <regexp
pattern="(<ignite\.version>).+(</ignite\.version>)" />
- <substitution
expression="\1${project.version}\2" />
- <fileset
dir="${project.basedir}/docs/">
- <include
name="_docs/code-snippets/java/pom.xml" />
- </fileset>
- </replaceregexp>
-
<replaceregexp byline="true"
encoding="UTF-8">
<regexp pattern="(version: ).+"
/>
<substitution
expression="\1${project.version}" />
```
Summary:
1. **pom.xml** — drop the now-dead `update-versions` Ant rewrite of
`<ignite.version>` in the code-snippets pom (the property no longer exists; the
version comes from the parent's `${revision}`).
2. **code-snippets/java/pom.xml** — remove the redundant `ignite-kubernetes`
version (managed by `ignite-bom`); add a note on `ignite-jcl` explaining why
its explicit version stays (not in the BOM).
3. **commit-check.yml** — move the snippets compile step to the end of the
job so its `docs`-profile recompile of upstream modules doesn't clobber the
class reuse the surrounding steps rely on.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
