Skip to content

Commit

Permalink
Validation of codestart artifacts configured in extension descriptors…
Browse files Browse the repository at this point in the history
…, renamed quarkus-platform-descriptor-json to quarkus-core-codestarts, support loading codestarts referenced from extension metadata, an option to validate codestart artifact referenced from the extension metadata
  • Loading branch information
aloubyansky committed Mar 21, 2021
1 parent 5d54dc7 commit 2d8e590
Show file tree
Hide file tree
Showing 277 changed files with 152 additions and 1,355 deletions.
8 changes: 7 additions & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,13 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-platform-descriptor-json</artifactId>
<artifactId>quarkus-core-codestarts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-codestarts</artifactId>
<type>pom</type>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
}
},
"codestarts-artifacts": [
"${project.groupId}:quarkus-platform-descriptor-json::jar:${project.version}"
"${project.groupId}:quarkus-core-codestarts::jar:${project.version}"
]
}
}
2 changes: 1 addition & 1 deletion devtools/cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-platform-descriptor-json</artifactId>
<artifactId>quarkus-core-codestarts</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<version>999-SNAPSHOT</version>
</parent>

<artifactId>quarkus-platform-descriptor-json</artifactId>
<name>Quarkus - Dev tools - Platform Descriptor - JSON</name>
<artifactId>quarkus-core-codestarts</artifactId>
<name>Quarkus - Dev tools - Quarkus Core Codestarts</name>

<properties>
<gradle-wrapper.path>${project.basedir}/../gradle</gradle-wrapper.path>
Expand All @@ -29,48 +29,6 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-bom</id>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<outputDirectory>${project.build.outputDirectory}/quarkus-bom</outputDirectory>
<destFileName>pom.xml</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-bom-descriptor-json</id>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
<version>${project.version}</version>
<type>json</type>
<classifier>${project.version}</classifier>
<outputDirectory>${project.build.outputDirectory}/quarkus-bom-descriptor</outputDirectory>
<destFileName>extensions.json</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down Expand Up @@ -104,16 +62,6 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
<version>${project.version}</version>
<type>json</type>
<classifier>${project.version}</classifier>
</dependency>
</dependencies>

<profiles>
<profile>
<id>windows</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ supported-maven-versions=${supported-maven-versions}
# the proposed version must be in the range of the supported versions
proposed-maven-version=${proposed-maven-version}
maven-wrapper-version=${maven-wrapper.version}
gradle-wrapper-version=${gradle-wrapper.version}
gradle-wrapper-version=${gradle-wrapper.version}
2 changes: 1 addition & 1 deletion devtools/gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dependencies {

implementation "io.quarkus:quarkus-bootstrap-core:${version}"
implementation "io.quarkus:quarkus-devtools-common:${version}"
implementation "io.quarkus:quarkus-platform-descriptor-json:${version}"
implementation "io.quarkus:quarkus-core-deployment:${version}"

testImplementation "io.quarkus:quarkus-core-codestarts:${version}"
testImplementation 'org.mockito:mockito-core:3.8.0'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
Expand Down
10 changes: 9 additions & 1 deletion devtools/gradle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-platform-descriptor-json</artifactId>
<artifactId>quarkus-core-codestarts</artifactId>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion devtools/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-platform-descriptor-json</artifactId>
<artifactId>quarkus-core-codestarts</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2d8e590

Please sign in to comment.