Use metadata for gradle/maven repositories and separate gradle plugin…

… version As part of #11256
quarkusio · Aug 17, 2020 · f567862 · f567862
1 parent 72ecaa8
commit f567862
Show file tree

Hide file tree

Showing 65 changed files with 589 additions and 284 deletions.
diff --git a/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties b/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties
@@ -8,10 +8,16 @@ kotlin-version=${kotlin.version}
 scala-version=${scala.version}
 scala-plugin-version=${scala-plugin.version}
 
-# Plugin metadata
-plugin-groupId=${project.groupId}
-plugin-artifactId=quarkus-maven-plugin
-plugin-version=${project.version}
+quarkus-core-version=${project.version}
+
+# Maven plugin metadata
+maven-plugin-groupId=${project.groupId}
+maven-plugin-artifactId=quarkus-maven-plugin
+maven-plugin-version=${project.version}
+
+# Gradle plugin metadata
+gradle-plugin-id=io.quarkus
+gradle-plugin-version=${project.version}
 
 supported-maven-versions=${supported-maven-versions}
 # the proposed version must be in the range of the supported versions

diff --git a/...n/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute b/...n/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
@@ -8,6 +8,11 @@ plugins {
 repositories {
     mavenLocal()
     mavenCentral()
+{#if gradle.repositories}
+{#for rep in gradle.repositories}
+    maven { url = uri("{rep.url}") }
+{/for}
+{/if}
 }
 {/}
 

diff --git a/.../resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties b/.../resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties
@@ -1,6 +1,6 @@
 #Gradle properties
-#Tue Jun 16 08:41:21 UTC 2020
-quarkusPluginVersion={quarkus.plugin.version}
+quarkusPluginId={quarkus.gradle-plugin.id}
+quarkusPluginVersion={quarkus.gradle-plugin.version}
 quarkusPlatformGroupId={quarkus.platform.group-id}
 quarkusPlatformArtifactId={quarkus.platform.artifact-id}
 quarkusPlatformVersion={quarkus.platform.version}
diff --git a/...otlin-dsl/base/wrapper/gradle-wrapper.jar → ...sl/base/gradle/wrapper/gradle-wrapper.jar b/...otlin-dsl/base/wrapper/gradle-wrapper.jar → ...sl/base/gradle/wrapper/gradle-wrapper.jar
diff --git a/...rapper/gradle-wrapper.tpl.qute.properties → ...rapper/gradle-wrapper.tpl.qute.properties b/...rapper/gradle-wrapper.tpl.qute.properties → ...rapper/gradle-wrapper.tpl.qute.properties
diff --git a/...esources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/settings.tpl.qute.gradle.kts b/...esources/bundled-codestarts/buildtool/gradle-kotlin-dsl/base/settings.tpl.qute.gradle.kts
@@ -1,12 +1,18 @@
 pluginManagement {
     val quarkusPluginVersion: String by settings
+    val quarkusPluginId: String by settings
     repositories {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
+{#if gradle.plugin-repositories}
+{#for rep in gradle.plugin-repositories}
+        maven { url = uri("{rep.url}") }
+{/for}
+{/if}
     }
     plugins {
-        id("io.quarkus") version quarkusPluginVersion
+        id(quarkusPluginId) version quarkusPluginVersion
     }
 }
 rootProject.name="{project.artifact-id}"
diff --git a/...ptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml b/...ptor-json/src/main/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/codestart.yml
@@ -7,7 +7,7 @@ language:
   base:
     data:
       quarkus:
-        plugin:
+        gradle-plugin:
           id: io.quarkus
       gradle:
         version: 6.5.1

diff --git a/...n/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/java/build.tpl.qute.gradle.kts b/...n/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/java/build.tpl.qute.gradle.kts
@@ -2,7 +2,7 @@
 {#plugins}
 plugins {
     java
-    id("{quarkus.plugin.id}")
+    id("{quarkus.gradle-plugin.id}")
 }
 {/plugins}
 {/include}

diff --git a/...resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts b/...resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     kotlin("jvm") version "{kotlin.version}"
     kotlin("plugin.allopen") version "{kotlin.version}"
-    id("{quarkus.plugin.id}")
+    id("{quarkus.gradle-plugin.id}")
 }
 {/plugins}
 {/include}

diff --git a/.../resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts b/.../resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts
@@ -2,9 +2,9 @@
 {#plugins}
 plugins {
     scala
-    id("{quarkus.plugin.id}")
+    id("{quarkus.gradle-plugin.id}")
 }
-        {/plugins}
+{/plugins}
 {/include}
 
 tasks.withType<ScalaCompile> {

diff --git a/...son/src/main/resources/bundled-codestarts/buildtool/gradle/base/build-layout.include.qute b/...son/src/main/resources/bundled-codestarts/buildtool/gradle/base/build-layout.include.qute
@@ -1,13 +1,18 @@
 {#insert plugins}
 plugins {
-    id '{quarkus.plugin.id}'
+    id '{quarkus.gradle-plugin.id}'
 }
 {/}
 
 {#insert repositories}
 repositories {
     mavenLocal()
     mavenCentral()
+{#if gradle.repositories}
+{#for rep in gradle.repositories}
+    maven { url "{rep.url}" }
+{/for}
+{/if}
 }
 {/}
 

diff --git a/...on/src/main/resources/bundled-codestarts/buildtool/gradle/base/gradle.tpl.qute.properties b/...on/src/main/resources/bundled-codestarts/buildtool/gradle/base/gradle.tpl.qute.properties
@@ -1,6 +1,6 @@
 #Gradle properties
-#Tue Jun 16 08:41:21 UTC 2020
-quarkusPluginVersion={quarkus.plugin.version}
+quarkusPluginId={quarkus.gradle-plugin.id}
+quarkusPluginVersion={quarkus.gradle-plugin.version}
 quarkusPlatformGroupId={quarkus.platform.group-id}
 quarkusPlatformArtifactId={quarkus.platform.artifact-id}
 quarkusPlatformVersion={quarkus.platform.version}
diff --git a/...json/src/main/resources/bundled-codestarts/buildtool/gradle/base/settings.tpl.qute.gradle b/...json/src/main/resources/bundled-codestarts/buildtool/gradle/base/settings.tpl.qute.gradle
@@ -3,9 +3,14 @@ pluginManagement {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
+{#if gradle.plugin-repositories}
+{#for rep in gradle.plugin-repositories}
+        maven { url "{rep.url}" }
+{/for}
+{/if}
     }
     plugins {
-        id '{quarkus.plugin.id}' version "$\{quarkusPluginVersion}"
+        id "$\{quarkusPluginId}" version "$\{quarkusPluginVersion}"
     }
 }
 rootProject.name='{project.artifact-id}'
diff --git a/...form-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml b/...form-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/codestart.yml
@@ -7,7 +7,7 @@ language:
   base:
     data:
       quarkus:
-        plugin:
+        gradle-plugin:
           id: io.quarkus
       gradle:
         version: 6.5.1

diff --git a/...or-json/src/main/resources/bundled-codestarts/buildtool/gradle/java/build.tpl.qute.gradle b/...or-json/src/main/resources/bundled-codestarts/buildtool/gradle/java/build.tpl.qute.gradle
@@ -2,7 +2,7 @@
 {#plugins}
 plugins {
     id 'java'
-    id '{quarkus.plugin.id}'
+    id '{quarkus.gradle-plugin.id}'
 }
 {/plugins}
 {/include}

diff --git a/...-json/src/main/resources/bundled-codestarts/buildtool/gradle/kotlin/build.tpl.qute.gradle b/...-json/src/main/resources/bundled-codestarts/buildtool/gradle/kotlin/build.tpl.qute.gradle
@@ -3,7 +3,7 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "{kotlin.version}"
     id "org.jetbrains.kotlin.plugin.allopen" version "{kotlin.version}"
-    id '{quarkus.plugin.id}'
+    id '{quarkus.gradle-plugin.id}'
 }
 {/plugins}
 {/include}

diff --git a/...r-json/src/main/resources/bundled-codestarts/buildtool/gradle/scala/build.tpl.qute.gradle b/...r-json/src/main/resources/bundled-codestarts/buildtool/gradle/scala/build.tpl.qute.gradle
@@ -2,9 +2,9 @@
 {#plugins}
 plugins {
     id 'scala'
-    id '{quarkus.plugin.id}'
+    id '{quarkus.gradle-plugin.id}'
 }
-        {/plugins}
+{/plugins}
 {/include}
 
 compileScala {

diff --git a/...scriptor-json/src/main/resources/bundled-codestarts/buildtool/maven/base/pom.tpl.qute.xml b/...scriptor-json/src/main/resources/bundled-codestarts/buildtool/maven/base/pom.tpl.qute.xml
@@ -15,7 +15,7 @@
         <quarkus.platform.group-id>{quarkus.platform.group-id}</quarkus.platform.group-id>
         <quarkus.platform.artifact-id>{quarkus.platform.artifact-id}</quarkus.platform.artifact-id>
         <quarkus.platform.version>{quarkus.platform.version}</quarkus.platform.version>
-        <quarkus-plugin.version>{quarkus.plugin.version}</quarkus-plugin.version>
+        <quarkus-plugin.version>{quarkus.maven-plugin.version}</quarkus-plugin.version>
         <compiler-plugin.version>{maven-compiler-plugin.version}</compiler-plugin.version>
         <surefire-plugin.version>{maven-surefire-plugin.version}</surefire-plugin.version>
     </properties>
@@ -31,6 +31,39 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    {#if maven.repositories}
+
+    <repositories>
+        {#for rep in maven.repositories}
+        <repository>
+            <id>{rep.id}</id>
+            <url>{rep.url}</url>
+            <releases>
+                <enabled>{rep.releases-enabled ?: true}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>{rep.snapshots-enabled ?: true}</enabled>
+            </snapshots>
+        </repository>
+        {/for}
+    </repositories>
+    {/if}
+    {#if maven.plugin-repositories}
+    <pluginRepositories>
+        {#for rep in maven.plugin-repositories}
+        <pluginRepository>
+            <id>{rep.id}</id>
+            <url>{rep.url}</url>
+            <releases>
+                <enabled>{rep.releases-enabled ?: true}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>{rep.snapshots-enabled ?: true}</enabled>
+            </snapshots>
+        </pluginRepository>
+        {/for}
+    </pluginRepositories>
+    {/if}
 
     <dependencies>
         {#each dependencies}
@@ -65,9 +98,9 @@
         <plugins>
             <!-- Quarkus build plugin - also provides the quarkus:dev live-reload feature -->
             <plugin>
-                <groupId>{quarkus.plugin.group-id}</groupId>
-                <artifactId>{quarkus.plugin.artifact-id}</artifactId>
-                <version>$\{quarkus-plugin.version}</version>
+                <groupId>{quarkus.maven-plugin.group-id}</groupId>
+                <artifactId>{quarkus.maven-plugin.artifact-id}</artifactId>
+                <version>$\{quarkus-maven-plugin.version}</version>
                 {#if uberjar}
                 <configuration>
                     <uberJar>true</uberJar>

diff --git a/.../bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar b/.../bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.fast-jar
@@ -21,10 +21,10 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM {dockerfile.fast-jar.from}
 
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
+ARG JAVA_PACKAGE={dockerfile.fast-jar.java-package}
+ARG RUN_JAVA_VERSION={dockerfile.fast-jar.run-java-version}
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 

diff --git a/...urces/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm b/...urces/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm
@@ -21,10 +21,10 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM {dockerfile.jvm.from}
 
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
+ARG JAVA_PACKAGE={dockerfile.jvm.java-package}
+ARG RUN_JAVA_VERSION={dockerfile.jvm.run-java-version}
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 

diff --git a/...es/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native b/...es/bundled-codestarts/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM {dockerfile.native.from}
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

diff --git a/...m-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/codestart.yml b/...m-descriptor-json/src/main/resources/bundled-codestarts/tooling/dockerfiles/codestart.yml
@@ -2,3 +2,17 @@
 name: dockerfiles
 type: tooling
 preselected: true
+language:
+  base:
+    data:
+      dockerfile:
+        jvm:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.1
+          java-package: java-11-openjdk-headless
+          run-java-version: 1.3.8
+        fast-jar:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.1
+          java-package: java-11-openjdk-headless
+          run-java-version: 1.3.8
+        native:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.1
diff --git a/...scriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl b/...scriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO
diff --git a/...latform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl b/...latform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl
@@ -15,7 +15,7 @@
         <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
         <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
+        <quarkus-plugin.version>${maven_plugin_version}</quarkus-plugin.version>
         <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
         <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
     </properties>
@@ -55,8 +55,8 @@
         <plugins>
             <!-- Quarkus build plugin - also provides the quarkus:dev live-reload feature -->
             <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
+                <groupId>${maven_plugin_groupId}</groupId>
+                <artifactId>${maven_plugin_artifactId}</artifactId>
                 <version>${quarkus-plugin.version}</version>
                 <executions>
                     <execution>

diff --git a/...descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl b/...descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        mavenLocal()${maven_plugin_repositories}
+        mavenLocal()
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal()${maven_plugin_repositories}
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"

diff --git a/...riptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl b/...riptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO
diff --git a/...tform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl b/...tform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
@@ -15,7 +15,7 @@
         <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
         <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
+        <quarkus-plugin.version>${maven_plugin_version}</quarkus-plugin.version>
         <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
         <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
         <kotlin.version>${kotlin_version}</kotlin.version>
@@ -62,8 +62,8 @@
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
+                <groupId>${maven_plugin_groupId}</groupId>
+                <artifactId>${maven_plugin_artifactId}</artifactId>
                 <version>${quarkus-plugin.version}</version>
                 <executions>
                     <execution>

diff --git a/...scriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl b/...scriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        mavenLocal()${maven_plugin_repositories}
+        mavenLocal()
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal()${maven_plugin_repositories}
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"

diff --git a/...criptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl b/...criptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO