Skip to content

chore: adopt major.minor.micro versioning and document branching strategy #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Croway wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: adopt major.minor.micro versioning and document branching strategy #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,22 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
- LangChain4j 1.x
- Maven, Spotless (Palantir Java Format), JUnit 5, AssertJ, Testcontainers, Citrus Test Framework

## Branching and Versioning Strategy

Forage uses **major.minor.micro** versioning (`1.4.0`, `1.4.1`, `1.5.0`, etc.).

| Branch | Tracks | Version | Description |
|--------|--------|---------|-------------|
| `main` | Apache Camel LTS | `1.4.x` | Follows the latest Camel LTS release (currently 4.18.x). Micro bumps (`1.4.0` → `1.4.1` → ...) for each release. |
| `camel-latest` | Latest Apache Camel | `1.5.x` | Follows the latest Camel release (currently 4.20.x) with corresponding Spring Boot and Quarkus versions. |

### Backporting

When making changes (features, bug fixes, etc.), **always investigate whether the change needs backporting** to the other branch:
- A fix on `main` may also apply to `camel-latest` and vice versa.
- After completing work on one branch, check if the same change is relevant to the other branch and create a backport PR if needed.
- Use `/oss-backport-pr` to automate backporting when applicable.

## Build Commands

```bash
Expand Down Expand Up @@ -211,10 +227,3 @@ See **[docs/adding-modules.md](docs/adding-modules.md)** for the complete guide
- Properties files named `<module-name>.properties` in resources
- **Special cases:** `FlipRoutePolicyConfig` and `ScheduleRoutePolicyConfig` extend `AbstractConfig` and follow the standard configuration pattern. Their ConfigEntries classes (`FlipRoutePolicyConfigEntries`, `ScheduleRoutePolicyConfigEntries`) use a dynamic ConfigModule pattern with factory methods (e.g., `pairedRoute(prefix)`) instead of static fields + `initModules()`, because property names are route-ID-dependent.

## Active Technologies
- Java 17+ + Apache Camel 4.16+, camel-api (RoutePolicyFactory, RoutePolicy) (001-route-policies)
- N/A (stateless policy configuration) (001-route-policies)
- Java 17+ + Apache Camel 4.16+ (camel-api: RoutePolicyFactory, RoutePolicy, RoutePolicySupport) (001-route-policies)

## Recent Changes
- 001-route-policies: Added Java 17+ + Apache Camel 4.16+, camel-api (RoutePolicyFactory, RoutePolicy)
2 changes: 1 addition & 1 deletion core/forage-catalog-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-catalog-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-catalog-reader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-catalog-reader</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-ai/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-ai</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-cloud/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-cloud</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-cxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-cxf</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-guardrails/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-guardrails</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-jdbc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-jms</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-jta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-jta</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-messaging</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-policy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-policy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-security</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-vectordb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-vectordb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/forage-core-vertx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-core-vertx</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>forage</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion forage-catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>forage</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-catalog</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>integration-tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/cxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>integration-tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>integration-tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>integration-tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>integration-tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>forage</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/camel-quarkus/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agent-camel-quarkus</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-quarkus-agent-deployment</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/camel-quarkus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agents</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>agent-camel-quarkus</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/camel-quarkus/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agent-camel-quarkus</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-quarkus-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/forage-agent-factories/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agents</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-agent-factories</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/forage-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agents</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>ai</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>agents</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/spring-boot/forage-agent-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agent-spring-boot</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-agent-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/agents/spring-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>agents</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>agent-spring-boot</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/forage-memory-infinispan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>chat-memory</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-memory-infinispan</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/forage-memory-message-window/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>chat-memory</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-memory-message-window</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/forage-memory-redis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>chat-memory</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-memory-redis</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>ai</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>chat-memory</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/tests/forage-memory-tests-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>tests</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-memory-tests-tck</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/chat-memory/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>chat-memory</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/guardrails/forage-guardrails-input/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>guardrails</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-guardrails-input</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/guardrails/forage-guardrails-output/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>guardrails</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>forage-guardrails-output</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion library/ai/guardrails/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.kaoto.forage</groupId>
<artifactId>ai</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>guardrails</artifactId>
Expand Down
Loading
Loading