Skip to content

Commit 8808b6f

Browse files
committed
upgrade from upstream
2 parents 0eb669a + ffaea42 commit 8808b6f

2,636 files changed

Lines changed: 109324 additions & 111030 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The following pattern must be used: `IGNITE-XXXX Change summary` where `XXXX` -
1414
- [ ] A reviewer has been mentioned through the JIRA comments
1515
(see [the Maintainers list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers))
1616
- [ ] The pull request has been checked by the Teamcity Bot and
17-
the `green visa` attached to the JIRA ticket (see [TC.Bot: Check PR](https://mtcga.gridgain.com/prs.html))
17+
the `green visa` attached to the JIRA ticket (see tab `PR Check` at [TC.Bot - Instance 1](https://tcbot2.sbt-ignite-dev.ru/prs.html) or [TC.Bot - Instance 2](https://mtcga.gridgain.com/prs.html))
1818

1919
### Notes
2020
- [How to Contribute](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute)
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: Protected Classes
17+
18+
on: pull_request_target
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
check-protected-classes:
26+
runs-on: ubuntu-latest
27+
name: Rolling Upgrade check
28+
permissions:
29+
issues: write
30+
pull-requests: write
31+
steps:
32+
- uses: actions/checkout@v6
33+
with:
34+
ref: ${{ github.event.pull_request.head.sha }}
35+
fetch-depth: 0
36+
37+
- name: Rolling Upgrade check
38+
id: check
39+
run: |
40+
BASE_SHA=${{ github.event.pull_request.base.sha }}
41+
HEAD_SHA=${{ github.event.pull_request.head.sha }}
42+
43+
HITS=""
44+
45+
# New and deleted files: check diff content for @Order annotation.
46+
for file in $(git diff --name-only --no-renames --diff-filter=AD "$BASE_SHA"..."$HEAD_SHA" -- '*.java'); do
47+
if git diff "$BASE_SHA"..."$HEAD_SHA" -- "$file" | grep -q 'org.apache.ignite.internal.Order'; then
48+
HITS="${HITS}${file}\n"
49+
fi
50+
done
51+
52+
# Modified files: check base version content for @Order annotation.
53+
for file in $(git diff --name-only --no-renames --diff-filter=M "$BASE_SHA"..."$HEAD_SHA" -- '*.java'); do
54+
if git show "${BASE_SHA}:${file}" 2>/dev/null | grep -q 'org.apache.ignite.internal.Order'; then
55+
HITS="${HITS}${file}\n"
56+
fi
57+
done
58+
59+
if [ -n "$HITS" ]; then
60+
echo "affected=true" >> "$GITHUB_OUTPUT"
61+
printf '%b' "$HITS" > /tmp/protected-hits.txt
62+
fi
63+
64+
- name: Comment on PR
65+
if: steps.check.outputs.affected == 'true'
66+
uses: actions/github-script@v8
67+
with:
68+
script: |
69+
const fs = require('fs');
70+
const hits = fs.readFileSync('/tmp/protected-hits.txt', 'utf8').trim();
71+
const body = [
72+
'## Possible compatibility issues. Please, check rolling upgrade cases',
73+
'',
74+
'This PR modifies protected classes (with **Order** annotation).',
75+
'Changes to these classes can break rolling upgrade compatibility.',
76+
'',
77+
'**Affected files:**',
78+
hits.split('\n').map(f => '- `' + f.trim() + '`').join('\n'),
79+
'',
80+
].join('\n');
81+
82+
const { data: comments } = await github.rest.issues.listComments({
83+
owner: context.repo.owner,
84+
repo: context.repo.repo,
85+
issue_number: context.issue.number,
86+
});
87+
88+
const existing = comments.find(c => c.body.includes('Possible compatibility issues. Please, check rolling upgrade cases'));
89+
90+
if (existing) {
91+
await github.rest.issues.deleteComment({
92+
owner: context.repo.owner,
93+
repo: context.repo.repo,
94+
comment_id: existing.id,
95+
});
96+
}
97+
98+
await github.rest.issues.createComment({
99+
owner: context.repo.owner,
100+
repo: context.repo.repo,
101+
issue_number: context.issue.number,
102+
body,
103+
});
104+
105+
- name: Add label
106+
if: steps.check.outputs.affected == 'true'
107+
uses: actions/github-script@v8
108+
with:
109+
script: |
110+
await github.rest.issues.addLabels({
111+
owner: context.repo.owner,
112+
repo: context.repo.repo,
113+
issue_number: context.issue.number,
114+
labels: ['compatibility'],
115+
});
116+
117+
- name: Fail on affected check
118+
if: steps.check.outputs.affected == 'true'
119+
run: |
120+
exit 1

.github/workflows/commit-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Check javadocs.
7070
run : |
71-
./mvnw -DskipTests install -pl modules/tools -B -V && ./mvnw initialize -Pjavadoc -B -V
71+
./mvnw -DskipTests install -pl modules/tools,modules/codegen -B -V && ./mvnw initialize -Pjavadoc -B -V
7272
7373
check-dotnet:
7474
name: Сheck .NET code
@@ -97,7 +97,7 @@ jobs:
9797
cfg:
9898
- { python: "3.8", toxenv: "py38" }
9999
- { python: "3.9", toxenv: "py39" }
100-
- { python: "3.8", toxenv: "codestyle" }
100+
- { python: "3.9", toxenv: "codestyle" }
101101
steps:
102102
- uses: actions/checkout@v4
103103
with:

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
server-username: NEXUS_USER
4242
server-password: NEXUS_PW
4343
- name: Deploy
44-
run: ./mvnw deploy -Pcheckstyle,compatibility -DskipTests -Dmaven.javadoc.skip=true -B -V
44+
run: ./mvnw deploy -Pcheckstyle -DskipTests -Dmaven.javadoc.skip=true -B -V
4545
env:
4646
NEXUS_USER: ${{ secrets.NEXUS_USER }}
4747
NEXUS_PW: ${{ secrets.NEXUS_PW }}

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# limitations under the License.
1616
#
1717

18-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
18+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
1919
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
2-
#
31
# Licensed to the Apache Software Foundation (ASF) under one or more
42
# contributor license agreements. See the NOTICE file distributed with
53
# this work for additional information regarding copyright ownership.
@@ -14,40 +12,10 @@
1412
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1513
# See the License for the specific language governing permissions and
1614
# limitations under the License.
17-
#
18-
19-
#
20-
# Router command line loader.
21-
#
2215

23-
#
24-
# Import common functions.
25-
#
26-
if [ "${IGNITE_HOME}" = "" ]; then
27-
IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")"
28-
else
29-
IGNITE_HOME_TMP=${IGNITE_HOME}
30-
fi
31-
32-
#
33-
# Set SCRIPTS_HOME - base path to scripts.
34-
#
35-
SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
16+
# This file specifies the code owners for the different parts of the repository.
17+
# See also: https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-AppendixA.Componentsandtheirmaintainers
3618

37-
source "${SCRIPTS_HOME}"/include/functions.sh
38-
39-
#
40-
# Discover IGNITE_HOME environment variable.
41-
#
42-
setIgniteHome
43-
44-
#
45-
# Set router service environment.
46-
#
47-
export DEFAULT_CONFIG=config/router/default-router.xml
48-
export MAIN_CLASS=org.apache.ignite.internal.client.router.impl.GridRouterCommandLineStartup
49-
50-
#
51-
# Start router service.
52-
#
53-
. "${SCRIPTS_HOME}"/ignite.sh $@
19+
# Platforms
20+
/modules/platforms/dotnet/ ptupitsyn@apache.org
21+
/modules/platforms/cpp/ isapego@apache.org

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Apache Ignite is a distributed database for high-performance computing with in-m
1515

1616
<p align="center">
1717
<a href="https://ignite.apache.org">
18-
<img src="https://github.com/apache/ignite-website/blob/master/docs/2.9.0/images/ignite_clustering.png" width="400px"/>
18+
<img src="https://github.com/apache/ignite-website/blob/master/docs/ignite2/2.9.0/images/ignite_clustering.png" width="400px"/>
1919
</a>
2020
</p>
2121

0 commit comments

Comments
 (0)