Merge branch 'main' into dependencies · a2aproject/a2a-java@46af4ba · GitHub
Skip to content

Commit 46af4ba

Browse files
kabirkabir
authored
Merge branch 'main' into dependencies
2 parents 7cddfcb + a7a85d4 commit 46af4ba

73 files changed

Lines changed: 4726 additions & 249 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/workflows/verify-grpc-generation.yml‎

Lines changed: 29 additions & 0 deletions

‎AGENTS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ mvn clean install
7474
- Try to use existing code instead of generating new similar code
7575
- Use the same code convention than existing code. If the existing convention seems incorrect, make suggestion before doing any changes
7676

77+
### Documentation Site
78+
79+
The docs site (`docs/`) uses versioned content folders (`docs/content/1.0.0.Final/`, `docs/content/1.1.0.Final/`, `docs/content/dev/`). When updating documentation to reflect code changes, only edit pages under `docs/content/dev/` — released version folders are frozen snapshots and must not be modified. New versioned folders are created at release time (see RELEASE.md).
80+
7781
### PR instructions
7882
- Follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) for the commit title and message
7983
- Always ask if the commit is related to a GitHub issue. If that's the case, add a `This fixes #{issue_number}` at the end of the commit message

‎RELEASE.md‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,32 @@ Artifacts should include:
161161
- `.pom` files
162162
- `.asc` GPG signatures for all artifacts
163163

164-
### 9. Increment to Next SNAPSHOT
164+
### 9. Update Versioned Documentation
165+
166+
Create a new documentation version for the release:
167+
168+
```bash
169+
# Copy dev docs to the new version folder
170+
cp -r docs/content/dev docs/content/X.Y.Z.Final
171+
172+
# Create a new version data file
173+
cp docs/data/versions/dev.yml docs/data/versions/X.Y.Z.Final.yml
174+
```
175+
176+
Edit `docs/data/versions/X.Y.Z.Final.yml`:
177+
- Set `label` to `"X.Y.Z.Final"`
178+
- Set `path` to `"X.Y.Z.Final"`
179+
- Set `sortOrder` to the next number (higher than the previous release)
180+
- Set `defaultVersion` to `true`
181+
- Set `devVersion` to `false`
182+
- Adjust the `menu` list if the new version adds or removes pages
183+
184+
Update the previous default version's data file (e.g., `docs/data/versions/OLD_VERSION.yml`):
185+
- Set `defaultVersion` to `false`
186+
187+
Review the new version's content for accuracy — ensure all pages reflect features available in this release.
188+
189+
### 10. Increment to Next SNAPSHOT
165190

166191
Prepare repository for next development cycle:
167192

‎boms/extras/src/it/extras-usage-test/src/main/java/org/a2aproject/sdk/bom/test/extras/ExtrasBomVerifier.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class ExtrasBomVerifier extends DynamicBomVerifier {
1313

1414
private static final Set<String> EXTRAS_EXCLUSIONS = Set.of(
1515
"boms/", // BOM test modules themselves
16+
"docs/", // Documentation site (not an SDK artifact)
1617
"examples/", // Example applications
1718
"itk/", // Integration Test Kit agent
1819
"tck/", // TCK test suite

‎boms/reference/src/it/reference-usage-test/src/main/java/org/a2aproject/sdk/bom/test/reference/ReferenceBomVerifier.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class ReferenceBomVerifier extends DynamicBomVerifier {
1313

1414
private static final Set<String> REFERENCE_EXCLUSIONS = Set.of(
1515
"boms/", // BOM test modules themselves
16+
"docs/", // Documentation site (not an SDK artifact)
1617
"examples/", // Example applications
1718
"itk/", // Integration Test Kit agent
1819
"tck/", // TCK test suite

‎boms/sdk/src/it/sdk-usage-test/src/main/java/org/a2aproject/sdk/bom/test/sdk/SdkBomVerifier.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class SdkBomVerifier extends DynamicBomVerifier {
1313

1414
private static final Set<String> SDK_EXCLUSIONS = Set.of(
1515
"boms/", // BOM test modules themselves
16+
"docs/", // Documentation site (not an SDK artifact)
1617
"examples/", // Example applications
1718
"itk/", // Integration Test Kit agent
1819
"tck/", // TCK test suite

‎compat-0.3/spec-grpc/pom.xml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<profile>
9696
<id>proto-compile</id>
9797
<build>
98-
9998
<plugins>
10099
<plugin>
101100
<groupId>org.apache.maven.plugins</groupId>
@@ -125,21 +124,29 @@
125124
</plugin>
126125
<!-- Protocol Buffers Compiler Plugin -->
127126
<plugin>
128-
<groupId>org.xolstice.maven.plugins</groupId>
127+
<groupId>io.github.ascopes</groupId>
129128
<artifactId>protobuf-maven-plugin</artifactId>
130129
<version>${protobuf-maven-plugin.version}</version>
131130
<configuration>
132-
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
133-
<pluginId>grpc-java</pluginId>
134-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
135-
<outputDirectory>src/main/java</outputDirectory>
136-
<clearOutputDirectory>false</clearOutputDirectory>
131+
<skip>${skip.protobuf.generate}</skip>
132+
<cleanOutputDirectories>true</cleanOutputDirectories>
133+
<protoc kind="binary-maven">
134+
<version>${protobuf-java.version}</version>
135+
</protoc>
136+
<outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
137+
<plugins>
138+
<plugin kind="binary-maven">
139+
<groupId>io.grpc</groupId>
140+
<artifactId>protoc-gen-grpc-java</artifactId>
141+
<version>${grpc.version}</version>
142+
</plugin>
143+
</plugins>
137144
</configuration>
138145
<executions>
139146
<execution>
147+
<phase>generate-sources</phase>
140148
<goals>
141-
<goal>compile</goal>
142-
<goal>compile-custom</goal>
149+
<goal>generate</goal>
143150
</goals>
144151
</execution>
145152
</executions>

docs/content/boms.md renamed to docs/content/1.0.0.Final/boms.md

File renamed without changes.

docs/content/client.md renamed to docs/content/1.0.0.Final/client.md

Lines changed: 2 additions & 2 deletions

docs/content/compatibility.md renamed to docs/content/1.0.0.Final/compatibility.md

File renamed without changes.

0 commit comments

Comments
 (0)