This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 2f8865e13c Convert KotlinFeature from Kotlin to Java source
2f8865e13c is described below
commit 2f8865e13c566621637d42af8518550e4944f8e5
Author: James Netherton <[email protected]>
AuthorDate: Thu Nov 30 15:07:15 2023 +0000
Convert KotlinFeature from Kotlin to Java source
Fixes #5578
---
extensions/kotlin/deployment/pom.xml | 83 +++-------------------
.../quarkus/kotlin/deployment/KotlinFeature.java} | 16 ++---
2 files changed, 16 insertions(+), 83 deletions(-)
diff --git a/extensions/kotlin/deployment/pom.xml
b/extensions/kotlin/deployment/pom.xml
index 28f6d812fe..546abcbb7d 100644
--- a/extensions/kotlin/deployment/pom.xml
+++ b/extensions/kotlin/deployment/pom.xml
@@ -45,83 +45,18 @@
<build>
<plugins>
- <plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- <version>${kotlin.version}</version>
- <configuration>
- <jvmTarget>${maven.compiler.release}</jvmTarget>
- </configuration>
- <executions>
- <execution>
- <id>kapt</id>
- <goals>
- <goal>kapt</goal>
- </goals>
- <configuration>
- <sourceDirs>
- <sourceDir>src/main/kotlin</sourceDir>
- </sourceDirs>
- <annotationProcessorPaths>
- <annotationProcessorPath>
- <groupId>io.quarkus</groupId>
-
<artifactId>quarkus-extension-processor</artifactId>
- <version>${quarkus.version}</version>
- </annotationProcessorPath>
- </annotationProcessorPaths>
- </configuration>
- </execution>
- <execution>
- <id>compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <sourceDirs>
- <sourceDir>src/main/kotlin</sourceDir>
- </sourceDirs>
- </configuration>
- </execution>
- <execution>
- <id>test-compile</id>
- <goals>
- <goal>test-compile</goal>
- </goals>
- <configuration>
- <sourceDirs>
- <sourceDir>src/test/kotlin</sourceDir>
- </sourceDirs>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>java-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>java-test-compile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+
<artifactId>quarkus-extension-processor</artifactId>
+ <version>${quarkus.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git
a/extensions/kotlin/deployment/src/main/kotlin/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.kt
b/extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java
similarity index 72%
rename from
extensions/kotlin/deployment/src/main/kotlin/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.kt
rename to
extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java
index d010a27efb..c5ee18191c 100644
---
a/extensions/kotlin/deployment/src/main/kotlin/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.kt
+++
b/extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.kotlin.deployment
+package org.apache.camel.quarkus.kotlin.deployment;
-import io.quarkus.deployment.annotations.BuildStep
-import io.quarkus.deployment.builditem.FeatureBuildItem
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
class KotlinFeature {
- companion object {
- private const val FEATURE = "camel-kotlin"
- }
+ private static final String FEATURE = "camel-kotlin";
@BuildStep
- fun feature(): FeatureBuildItem {
- return FeatureBuildItem(FEATURE)
+ FeatureBuildItem featureBuildItem() {
+ return new FeatureBuildItem(FEATURE);
}
-}
\ No newline at end of file
+}