-
Notifications
You must be signed in to change notification settings - Fork 568
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved version management for maven plugin to project root pom, moved plugin configuration there as well A fix in `AptTypeInfoFactory` where a NPE was possible.
- Loading branch information
1 parent
3d83e49
commit 11bb3ca
Showing
16 changed files
with
812 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2024 Oracle and/or its affiliates. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <groupId>io.helidon.service.tests.inject</groupId> | ||
| <artifactId>helidon-service-tests-inject-project</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>helidon-service-tests-inject-maven-plugin</artifactId> | ||
| <name>Helidon Service Tests Inject Maven Plugin</name> | ||
| <description>Tests for Maven Plugin</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.junit.jupiter</groupId> | ||
| <artifactId>junit-jupiter-params</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.junit.jupiter</groupId> | ||
| <artifactId>junit-jupiter-api</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hamcrest</groupId> | ||
| <artifactId>hamcrest-all</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.helidon.build-tools.common</groupId> | ||
| <artifactId>helidon-build-common-test-utils</artifactId> | ||
| <version>${version.plugin.helidon-build-tools}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <excludes> | ||
| <exclude>**/*IT.java</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-invoker-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>install</goal> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
98 changes: 98 additions & 0 deletions
98
service/tests/inject/maven-plugin/src/it/projects/test1/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2024 Oracle and/or its affiliates. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>io.helidon.service.tests.inject.maven.plugin.test</groupId> | ||
| <artifactId>test-1</artifactId> | ||
| <version>@project.version@</version> | ||
| <name>Test Inject Maven Plugin 1</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.helidon.service</groupId> | ||
| <artifactId>helidon-service-registry</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.helidon.service.inject</groupId> | ||
| <artifactId>helidon-service-inject-api</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.helidon.service.inject</groupId> | ||
| <artifactId>helidon-service-inject</artifactId> | ||
| <version>@project.version@</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <annotationProcessorPaths> | ||
| <path> | ||
| <groupId>io.helidon.codegen</groupId> | ||
| <artifactId>helidon-codegen-apt</artifactId> | ||
| <version>@project.version@</version> | ||
| </path> | ||
| <path> | ||
| <groupId>io.helidon.service.inject</groupId> | ||
| <artifactId>helidon-service-inject-codegen</artifactId> | ||
| <version>@project.version@</version> | ||
| </path> | ||
| <path> | ||
| <groupId>io.helidon.codegen</groupId> | ||
| <artifactId>helidon-codegen-helidon-copyright</artifactId> | ||
| <version>@project.version@</version> | ||
| </path> | ||
| </annotationProcessorPaths> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>io.helidon.service.inject</groupId> | ||
| <artifactId>helidon-service-inject-maven-plugin</artifactId> | ||
| <version>${project.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>create-application</id> | ||
| <goals> | ||
| <goal>create-application</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.helidon.codegen</groupId> | ||
| <artifactId>helidon-codegen-helidon-copyright</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <configuration> | ||
| <failOnWarning>true</failOnWarning> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
29 changes: 29 additions & 0 deletions
29
service/tests/inject/maven-plugin/src/it/projects/test1/postbuild.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright (c) 2022, 2024 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import io.helidon.build.common.test.utils.JUnitLauncher | ||
| import io.helidon.service.tests.inject.maven.plugin.ProjectsTestIT | ||
|
|
||
| //noinspection GroovyAssignabilityCheck,GrUnresolvedAccess | ||
| JUnitLauncher.builder() | ||
| .select(ProjectsTestIT.class, "test1", String.class) | ||
| .parameter("basedir", basedir.getAbsolutePath()) | ||
| .reportsDir(basedir) | ||
| .outputFile(new File(basedir, "test.log")) | ||
| .suiteId("helidon-inject-maven-plugin-it-test1") | ||
| .suiteDisplayName("Helidon Inject Maven Plugin Integration Test 1") | ||
| .build() | ||
| .launch() |
24 changes: 24 additions & 0 deletions
24
.../tests/inject/maven-plugin/src/it/projects/test1/src/main/java/my/module/ServiceType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Copyright (c) 2024 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package my.module; | ||
|
|
||
| import io.helidon.service.inject.api.Injection; | ||
|
|
||
| @Injection.Singleton | ||
| class ServiceType { | ||
|
|
||
| } |
Oops, something went wrong.