Skip to content

Commit b35d5dc

Browse files
authored
#1150: Upgrade to Camel 4.14.0 (#1158)
* #1150: Upgrade to Camel 4.14.0 * try fixing gradle validation failures by using different action
1 parent 82344cf commit b35d5dc

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

.github/workflows/ci-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
java-version: '21'
5353
cache: 'gradle'
5454
- name: Validate Gradle wrapper
55-
uses: gradle/wrapper-validation-action@v3
55+
uses: gradle/actions/wrapper-validation@v4.2.2
5656
- name: Build against all supported versions
5757
run: ./build.sh ${{ matrix.version }}
5858
shell: bash

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
camelVersion = 4.13.0
2-
camelQuarkusVersion = 3.24.0
1+
camelVersion = 4.14.0
2+
camelQuarkusVersion = 3.25.0
33
camelKameletVersion = 4.13.0
44
camelKarafVersion = 3.22.4
55
ideaVersion=2025.2

src/main/java/com/github/cameltooling/idea/catalog/SpringBootJSonSchemaResolver.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ public String getMainJsonSchema() {
128128
return schema == null ? delegate.getMainJsonSchema() : schema;
129129
}
130130

131+
@Override
132+
public String getJBangJsonSchema() {
133+
final String schema = toMainJsonSchema(getSpringConfigurationMetadata("camel-spring-boot", true));
134+
return schema == null ? delegate.getJBangJsonSchema() : schema;
135+
}
136+
131137
@Override
132138
public String getTransformerJSonSchema(String name) {
133139
return delegate.getTransformerJSonSchema(name);

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
v.1.4.2
1313
<ul>
1414
<li>Only IDEA 2025 onwards is supported</li>
15+
<li>Upgraded to Camel 4.14.0</li>
1516
</ul>
1617
]]>
1718
</change-notes>

src/test/java/com/github/cameltooling/idea/catalog/SpringBootJSonSchemaResolverTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ public String getMainJsonSchema() {
165165
return null;
166166
}
167167

168+
@Override
169+
public String getJBangJsonSchema() {
170+
return null;
171+
}
172+
168173
@Override
169174
public String getTransformerJSonSchema(String name) {
170175
return null;

src/test/java/com/github/cameltooling/idea/reference/CamelDirectEndpointReferencesBetweenModulesIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private Module initModule(String name) throws IOException {
5353
modifiableRootModel.setSdk(IdeaTestUtil.getMockJdk21());
5454
modifiableRootModel.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.JDK_17);
5555

56-
CamelTestDependencyUtil.loadDependencies(modifiableRootModel, "org.apache.camel:camel-core-model:4.13.0");
56+
CamelTestDependencyUtil.loadDependencies(modifiableRootModel, "org.apache.camel:camel-core-model:4.14.0");
5757
});
5858
IndexingTestUtil.waitUntilIndexesAreReady(module.getProject());
5959

0 commit comments

Comments
 (0)