Merge branch '1.2.x'

tardisoft · Oct 14, 2019 · 4beec0b · 4beec0b
2 parents 673cb46 + 272d5a8
commit 4beec0b
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 37 deletions.
diff --git a/bom/build.gradle b/bom/build.gradle
@@ -12,7 +12,6 @@ publishing {
                 xml.children().last() + {
                     def mkp = delegate
 
-                    mkp.packaging "pom"
                     mkp.properties {
                         for(dep in dependencyVersions) {
                             def v = dep.value.version

diff --git a/cli/src/main/groovy/io/micronaut/cli/boot/DependencyVersions.groovy b/cli/src/main/groovy/io/micronaut/cli/boot/DependencyVersions.groovy
@@ -70,7 +70,17 @@ class DependencyVersions implements DependencyManagement {
     @CompileDynamic
     void addDependencyManagement(GPathResult pom) {
         pom.dependencyManagement.dependencies.dependency.each { dep ->
-            addDependency(dep.groupId.text(), dep.artifactId.text(), dep.version.text())
+            String version = dep.version.text()
+            if (version.startsWith('${')) {
+               String property = version[2..-2]
+               def child = pom.getProperty("properties").children().find {
+                   it.name() == property
+               }
+               if (child) {
+                   version = child.text()
+               }
+            }
+            addDependency(dep.groupId.text(), dep.artifactId.text(), version)
         }
     }
 

diff --git a/cli/src/main/groovy/io/micronaut/cli/io/support/BuildTokens.groovy b/cli/src/main/groovy/io/micronaut/cli/io/support/BuildTokens.groovy
@@ -17,6 +17,7 @@ package io.micronaut.cli.io.support
 
 import io.micronaut.cli.profile.Feature
 import io.micronaut.cli.profile.Profile
+import io.micronaut.cli.profile.ProfileRepository
 import org.eclipse.aether.graph.Dependency
 import org.eclipse.aether.graph.Exclusion
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector
@@ -30,7 +31,7 @@ abstract class BuildTokens {
         this.appname = appname
     }
 
-    abstract Map getTokens(Profile profile, List<Feature> features)
+    abstract Map getTokens(ProfileRepository profileRepository, Profile profile, List<Feature> features)
 
     protected List<Dependency> materializeDependencies(Profile profile, List<Feature> features) {
         List<Dependency> profileDependencies = profile.dependencies

diff --git a/cli/src/main/groovy/io/micronaut/cli/io/support/GradleBuildTokens.groovy b/cli/src/main/groovy/io/micronaut/cli/io/support/GradleBuildTokens.groovy
@@ -18,6 +18,7 @@ package io.micronaut.cli.io.support
 import groovy.transform.InheritConstructors
 import io.micronaut.cli.profile.Feature
 import io.micronaut.cli.profile.Profile
+import io.micronaut.cli.profile.ProfileRepository
 import io.micronaut.cli.profile.repository.MavenProfileRepository
 import io.micronaut.cli.util.VersionInfo
 import org.eclipse.aether.graph.Dependency
@@ -29,7 +30,7 @@ import org.eclipse.aether.graph.Dependency
 @InheritConstructors
 class GradleBuildTokens extends BuildTokens {
 
-    Map getTokens(Profile profile, List<Feature> features) {
+    Map getTokens(ProfileRepository profileRepository, Profile profile, List<Feature> features) {
         Map tokens = [:]
         tokens.put("testFramework", testFramework)
         tokens.put("sourceLanguage", sourceLanguage)

diff --git a/cli/src/main/groovy/io/micronaut/cli/io/support/MavenBuildTokens.groovy b/cli/src/main/groovy/io/micronaut/cli/io/support/MavenBuildTokens.groovy
@@ -19,8 +19,10 @@ import groovy.transform.InheritConstructors
 import groovy.xml.MarkupBuilder
 import io.micronaut.cli.profile.Feature
 import io.micronaut.cli.profile.Profile
+import io.micronaut.cli.profile.ProfileRepository
 import io.micronaut.cli.profile.repository.MavenProfileRepository
 import io.micronaut.cli.util.VersionInfo
+import org.eclipse.aether.artifact.Artifact
 import org.eclipse.aether.graph.Dependency
 import org.eclipse.aether.graph.Exclusion
 
@@ -47,7 +49,7 @@ class MavenBuildTokens extends BuildTokens {
     }
 
     @Override
-    Map getTokens(Profile profile, List<Feature> features) {
+    Map getTokens(ProfileRepository profileRepository, Profile profile, List<Feature> features) {
         Map tokens = [:]
         tokens.put("testFramework", testFramework)
         tokens.put("sourceLanguage", sourceLanguage)
@@ -143,14 +145,21 @@ class MavenBuildTokens extends BuildTokens {
             annotationProcessorPathsXml."$methodToCall" {
                 groupId(artifact.groupId)
                 artifactId(artifact.artifactId)
+                def artifactVersion = artifact.version
+                if (!artifactVersion || artifactVersion == 'BOM') {
+                    def resolvedVersion = profileRepository.findVersion(artifact.artifactId)
+                    if (resolvedVersion ) {
+                        artifactVersion = resolvedVersion
+                    }
+                }
                 if (artifact.groupId.startsWith("io.micronaut")) {
-                    if (!artifact.version || artifact.version == 'BOM') {
+                    if (!artifactVersion || artifactVersion == 'BOM') {
                         version("\${micronaut.version}")
                     } else {
-                        version(artifact.version)
+                        version(artifactVersion)
                     }
                 } else {
-                    version(artifact.version)
+                    version(artifactVersion)
                 }
             }
         }

diff --git a/cli/src/main/groovy/io/micronaut/cli/profile/ProfileRepository.groovy b/cli/src/main/groovy/io/micronaut/cli/profile/ProfileRepository.groovy
@@ -17,6 +17,9 @@ package io.micronaut.cli.profile
 
 import io.micronaut.cli.io.support.Resource
 import org.eclipse.aether.artifact.Artifact
+import org.eclipse.aether.graph.Dependency
+
+import javax.annotation.Nullable
 
 /**
  *
@@ -70,4 +73,11 @@ interface ProfileRepository {
      * @return The {@link Artifact} that resolves to the profile
      */
     Artifact getProfileArtifact(String profileName)
+
+    /**
+     * Finds the version for the given artifact ID.
+     * @return the version
+     */
+    @Nullable String findVersion(String artifactId);
+
 }
diff --git a/cli/src/main/groovy/io/micronaut/cli/profile/commands/AbstractCreateCommand.groovy b/cli/src/main/groovy/io/micronaut/cli/profile/commands/AbstractCreateCommand.groovy
@@ -456,7 +456,7 @@ abstract class AbstractCreateCommand extends ArgumentCompletingCommand implement
             return
         }
 
-        Map tokens = buildTokens.getTokens(profile, features)
+        Map tokens = buildTokens.getTokens(profileRepository, profile, features)
 
         if (tokens == null) {
             return

diff --git a/cli/src/main/groovy/io/micronaut/cli/profile/repository/AbstractJarProfileRepository.groovy b/cli/src/main/groovy/io/micronaut/cli/profile/repository/AbstractJarProfileRepository.groovy
@@ -27,6 +27,7 @@ import io.micronaut.cli.profile.ProjectContext
 import io.micronaut.cli.profile.ProjectContextAware
 import org.eclipse.aether.artifact.Artifact
 import org.eclipse.aether.artifact.DefaultArtifact
+import org.eclipse.aether.graph.Dependency
 
 /**
  * A repository that loads profiles from JAR files
@@ -48,6 +49,11 @@ abstract class AbstractJarProfileRepository implements ProfileRepository {
         return profilesByName[profileName]
     }
 
+    @Override
+    String findVersion(String artifactId) {
+        return null
+    }
+
     @Override
     Profile getProfile(String profileName, Boolean parentProfile) {
         return getProfile(profileName)

diff --git a/cli/src/main/groovy/io/micronaut/cli/profile/repository/MavenProfileRepository.groovy b/cli/src/main/groovy/io/micronaut/cli/profile/repository/MavenProfileRepository.groovy
@@ -81,6 +81,12 @@ class MavenProfileRepository extends AbstractJarProfileRepository {
         this([DEFAULT_REPO])
     }
 
+    @Override
+    @CompileDynamic
+    String findVersion(String artifactId) {
+        return profileDependencyVersions.find(artifactId)?.version
+    }
+
     @Override
     Profile getProfile(String profileName, Boolean parentProfile) {
         String profileShortName = profileName

diff --git a/gradle.properties b/gradle.properties
@@ -37,7 +37,7 @@ developers=Graeme Rocher
 micronautSpringVersion=1.0.1
 micronautGcpVersion=1.1.0
 micronautGrpcVersion=1.0.1
-micronautAwsVersion=1.3.2
+micronautAwsVersion=1.3.3
 micronautRedisVersion=1.1.1
 micronautMongoVersion=1.1.0
 micronautNeo4jVersion=1.1.0

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -74,24 +74,20 @@ publishing {
     repositories {
         maven {
             credentials {
-                def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
-                def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
+                def bintrayUser = System.getenv("BINTRAY_USER") ?: project.hasProperty("bintrayUser") ? project.bintrayUser : ''
+                def bintrayKey = System.getenv("BINTRAY_KEY") ?: project.hasProperty("bintrayKey") ? project.bintrayKey : ''
 
-                username = ossUser
-                password = ossPass
-            }
-            if(isBuildSnapshot) {
-                url  "https://oss.sonatype.org/content/repositories/snapshots"
-            }
-            else {
-                url "https://repo.micronaut.io/artifactory/libs-releases-local"
+                username = bintrayUser
+                password = bintrayKey
             }
+            url  "https://oss.jfrog.org/oss-snapshot-local"
         }
     }
 
     publications {
         maven(MavenPublication) { publication ->
             artifactId( "micronaut-" + project.name.substring(project.name.indexOf('/') + 1) )
+
             def shadowJar = tasks.findByName("shadowJar")
             if(shadowJar && shadowJar.enabled) {
                 artifact(project.tasks.shadowJar) {
@@ -151,12 +147,15 @@ publishing {
 
             }
             else {
-                from components.java
-                artifact sourcesJar {
-                    classifier "sources"
-                }
-                artifact javadocJar {
-                    classifier "javadoc"
+
+                if (project.name != 'bom') {
+                    from components.java
+                    artifact sourcesJar {
+                        classifier "sources"
+                    }
+                    artifact javadocJar {
+                        classifier "javadoc"
+                    }
                 }
 
                 pom.withXml {

diff --git a/...-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java b/...-java/src/main/java/io/micronaut/annotation/processing/JavaAnnotationMetadataBuilder.java
@@ -17,6 +17,7 @@
 
 import io.micronaut.core.annotation.AnnotationClassValue;
 import io.micronaut.core.annotation.AnnotationUtil;
+import io.micronaut.core.util.ArrayUtils;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.core.value.OptionalValues;
 import io.micronaut.inject.annotation.AbstractAnnotationMetadataBuilder;
@@ -557,6 +558,13 @@ private class ArrayValueVisitor extends AbstractAnnotationValueVisitor8<Object,
 
             Object[] getValues() {
                 if (arrayType != null) {
+                    for (Object value : values) {
+                        if (value != null) {
+                            if (!arrayType.isInstance(value)) {
+                                return ArrayUtils.EMPTY_OBJECT_ARRAY;
+                            }
+                        }
+                    }
                     return values.toArray((Object[]) Array.newInstance(arrayType, values.size()));
                 } else {
                     return values.toArray(new Object[0]);

diff --git a/inject/src/main/java/io/micronaut/context/AbstractBeanConfiguration.java b/inject/src/main/java/io/micronaut/context/AbstractBeanConfiguration.java
@@ -42,7 +42,7 @@ protected AbstractBeanConfiguration(String thePackage) {
 
     @Override
     public Package getPackage() {
-        return Package.getPackage(packageName);
+        return getClass().getPackage();
     }
 
     @Override

diff --git a/src/main/docs/guide/appendix/usingsnapshots.adoc b/src/main/docs/guide/appendix/usingsnapshots.adoc
@@ -8,10 +8,8 @@ ext {
   micronautVersion = '1.0.2.BUILD-SNAPSHOT'
 }
 repositories {
-  mavenLocal()
-  mavenCentral()
   jcenter() <1>
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } // <2>
+  maven { url "https://oss.jfrog.org/oss-snapshot-local" } // <2>
 }
 dependencyManagement {
   imports {
@@ -20,8 +18,8 @@ dependencyManagement {
 }
 ----
 
-<1> Micronaut releases are available on jcenter
-<2> Micronaut snapshots are available on sonatype
+<1> Micronaut releases are available on JCenter and Maven Central
+<2> Micronaut snapshots are available on JFrog OSS
 
 In the case of Maven, edit `pom.xml`:
 
@@ -41,8 +39,8 @@ In the case of Maven, edit `pom.xml`:
       <url>https://jcenter.bintray.com</url> <!--2-->
     </repository>
     <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url> <!--3-->
+      <id>jfrog-snapshots</id>
+      <url>https://oss.jfrog.org/oss-snapshot-local</url> <!--3-->
     </repository>
   </repositories>
 
@@ -63,5 +61,5 @@ In the case of Maven, edit `pom.xml`:
 
 ----
 <1> Set the snapshot version.
-<2> Micronaut releases are available on jcenter
-<3> Micronaut snapshots are available on sonatype
+<2> Micronaut releases are available on JCenter and Maven Central
+<3> Micronaut snapshots are available on JFrog OSS Snapshots
diff --git a/src/main/docs/guide/httpClient/lowLevelHttpClient/clientBasics.adoc b/src/main/docs/guide/httpClient/lowLevelHttpClient/clientBasics.adoc
@@ -12,7 +12,7 @@ The above example will inject a client that targets the Twitter API.
 
 [source,kotlin]
 ----
-@Client("\${myapp.api.twitter.url}") @Inject httpClient: RxHttpClient
+@field:Client("\${myapp.api.twitter.url}") @Inject lateinit var httpClient: RxHttpClient
 ----
 
 The above Kotlin example will inject a client that targets the Twitter API using a configuration path. Note the required escaping (backslash) on `"\${path.to.config}"` which is required due to Kotlin string interpolation.

diff --git a/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/JaegerConfigurationSpec.groovy b/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/JaegerConfigurationSpec.groovy
@@ -0,0 +1,22 @@
+package io.micronaut.tracing.jaeger
+
+import io.jaegertracing.Configuration
+import io.micronaut.context.ApplicationContext
+import spock.lang.Specification
+
+class JaegerConfigurationSpec extends Specification {
+
+    void "test reporter configuration"() {
+        given:
+        def ctx = ApplicationContext.run(
+                'tracing.jaeger.enabled':'true',
+                'tracing.jaeger.sender.agentHost':'foo',
+                'tracing.jaeger.sender.agentPort':9999
+        )
+        def config = ctx.getBean(JaegerConfiguration).configuration
+
+        expect:
+        config.reporter.senderConfiguration.agentHost == 'foo'
+        config.reporter.senderConfiguration.agentPort == 9999
+    }
+}
diff --git a/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java b/tracing/src/main/java/io/micronaut/tracing/jaeger/JaegerConfiguration.java
@@ -247,6 +247,18 @@ public void setSenderConfiguration(@Nullable Configuration.SenderConfiguration s
                 configuration.withSender(senderConfiguration);
             }
         }
+
+        /**
+         * Sets the sender configuration.
+         *
+         * @param senderConfiguration The sender configuration
+         */
+        @Inject
+        public void setSenderConfiguration(@Nullable JaegerSenderConfiguration senderConfiguration) {
+            if (senderConfiguration != null) {
+                configuration.withSender(senderConfiguration.configuration);
+            }
+        }
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                 return
             }
-            Map tokens = buildTokens.getTokens(profile, features)
+            Map tokens = buildTokens.getTokens(profileRepository, profile, features)
             if (tokens == null) {
                 return
@@ Expand Down @@