Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .oss-ai-helper-rules/project-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This rule file contains branching, commit, PR, and task-finding conventions for
- **Find-task experienced JQL:** `project = CAMEL AND status = Open AND labels = help-wanted` (maxResults=10)
- **Scope-too-large redirect:** create a Jira issue directly
- **Merge procedure:**
1. Derive milestone from target branch: read `<version>` from root `pom.xml` on the target branch and strip `-SNAPSHOT` (e.g., `4.23.0-SNAPSHOT` → `4.23.0`)
1. Derive milestone from target branch: read `<version>` from root `pom.xml` on the target branch and strip `-SNAPSHOT` (e.g., `4.24.0-SNAPSHOT` → `4.23.0`)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Stale example: Same issue — 4.24.0-SNAPSHOT paired with 4.23.0. Should be 4.24.0.

Suggested change
1. Derive milestone from target branch: read `<version>` from root `pom.xml` on the target branch and strip `-SNAPSHOT` (e.g., `4.24.0-SNAPSHOT` → `4.23.0`)
1. Derive milestone from target branch: read `<version>` from root `pom.xml` on the target branch and strip `-SNAPSHOT` (e.g., `4.24.0-SNAPSHOT` → `4.24.0`)

2. Assign milestone to PR (`gh pr edit <PR> --milestone <version>`) and set `fixVersions` on the JIRA issue to the same version (before closing)
3. Assign PR to the PR author (`gh pr edit <PR> --add-assignee <author>`) and verify JIRA issue is assigned to the contributor. **Never guess the author** — look it up with `gh pr view <PR> --json author --jq '.author.login'`
4. Categorize PR with labels based on JIRA issue type or PR content: `bug` (Bug), `enhancement` (Improvement/New Feature), `documentation` (Documentation), `task` (Task/refactoring), `dependency` (dependency upgrades), `test` (Test)
Expand Down
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Guidelines for AI agents working on this codebase.

Apache Camel is an integration framework supporting routing rules in Java, XML and YAML DSLs.

- Version: 4.23.0-SNAPSHOT
- Version: 4.24.0-SNAPSHOT
- Java: 17+
- Build: Maven 3.9.12+

Expand Down Expand Up @@ -131,7 +131,7 @@ When merging a PR, an agent MUST perform the following steps **in order**:
1. **Derive the milestone from the target branch**:
- Read the `<version>` from the root `pom.xml` on the PR's **target branch** (e.g., `main`,
`camel-4.18.x`).
- Strip the `-SNAPSHOT` suffix to get the milestone name (e.g., `4.23.0-SNAPSHOT` → `4.23.0`).
- Strip the `-SNAPSHOT` suffix to get the milestone name (e.g., `4.24.0-SNAPSHOT` → `4.23.0`).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Stale example: The SNAPSHOT was bumped to 4.24.0-SNAPSHOT but the derived version in this example was left as 4.23.0. AI agents reading these guidelines after the merge will apply the wrong milestone.

Suggested change
- Strip the `-SNAPSHOT` suffix to get the milestone name (e.g., `4.24.0-SNAPSHOT` → `4.23.0`).
- Strip the `-SNAPSHOT` suffix to get the milestone name (e.g., `4.24.0-SNAPSHOT` → `4.24.0`).


2. **Assign the milestone**:
- Set the GitHub milestone on the PR: `gh pr edit <PR> --milestone <version>`.
Expand Down
2 changes: 1 addition & 1 deletion apache-camel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-api-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-dataformat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>4.23.0-SNAPSHOT</version>
<version>4.24.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
Loading
Loading