Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build to latest infrastructure #518

Merged
merged 5 commits into from
Mar 4, 2022
Merged

Update build to latest infrastructure #518

merged 5 commits into from
Mar 4, 2022

Conversation

timyates
Copy link
Contributor

@timyates timyates commented Mar 3, 2022

  • Removed the workaround for secure hashes (fixed in maven central)
  • Reinstated the daemon
  • Added parallel

Will fail currently as the docs are invalid in places (which is fixed once #509 is merged

- Removed the workaround for secure hashes (fixed in maven central)
- Reinstated the daemon
- Added parallel

Will fail currently as the docs are invalid in places (which is fixed once #509 is merged
@timyates timyates added the relates-to: build label for issues related to the build file or CI label Mar 3, 2022
@timyates timyates requested a review from sdelamo March 3, 2022 09:55
@timyates timyates self-assigned this Mar 3, 2022
@CLAassistant
Copy link

CLAassistant commented Mar 3, 2022

CLA assistant check
All committers have signed the CLA.

@timyates timyates requested a review from melix March 3, 2022 09:56
@timyates
Copy link
Contributor Author

timyates commented Mar 3, 2022

@melix can you see what's causing this?

https://ge.micronaut.io/s/ofpgo53lbt4n6/failure#1

Why is spock getting pulled into the junit5 tests and the native image?

@melix
Copy link
Contributor

melix commented Mar 3, 2022

Why is spock getting pulled into the junit5 tests and the native image?

https://ge.micronaut.io/s/ofpgo53lbt4n6/dependencies?focusedDependency=WzEsNSwyMjEsWzEsNSxbMjIxXV1d&toggled=W1sxXSxbMSw1XV0

Basically, before your changes, the plugin which was applied to test-junit5 as java-library. Now, it's io.micronaut.build.internal.module. This plugin is designed to apply spock automatically: https://github.com/micronaut-projects/micronaut-build/blob/278c63890a5457637a66eaef8d6dfe59addcf291/src/main/groovy/io/micronaut/build/MicronautModulePlugin.groovy#L29

So I think the plugin you want to apply instead is io.micronaut.build.internal.base-module.

@timyates
Copy link
Contributor Author

timyates commented Mar 3, 2022

@timyates
Copy link
Contributor Author

timyates commented Mar 3, 2022

Seems to...

Adding 166531b fixes the issue... @melix is this sensible? 🤔

@melix
Copy link
Contributor

melix commented Mar 3, 2022

I am unsure. I would compare the resulting pom/module files when publishing test-junit5. If you get Groovy on the classpath and that it wasn't the case before, then it's likely that you get more unwanted dependencies. In which case the base plugin to apply might not be internal-base-module but possibly something even more custom based on io.micronaut.build.internal.base

@timyates
Copy link
Contributor Author

timyates commented Mar 3, 2022

I'll take a look, thanks for the pointers 👍

@timyates
Copy link
Contributor Author

timyates commented Mar 3, 2022

TL;DR: I think we're ok


The only difference in the POM for test-junit5 is a new section

  <dependencyManagement>
    <dependencies>
      <dependency>
        <groupId>io.micronaut</groupId>
        <artifactId>micronaut-bom</artifactId>
        <version>3.0.0</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
    </dependencies>
  </dependencyManagement>

And for the module for test-junit5 we have 2 new things:

This in the dependencies:

        {
          "group": "io.micronaut",
          "module": "micronaut-bom",
          "version": {
            "requires": "3.0.0"
          },
          "attributes": {
            "org.gradle.category": "platform"
          },
          "endorseStrictVersions": true
        },

And a new sourcesElements and javadocElements sections at the bottom... These were absent before

test-core/build.gradle Outdated Show resolved Hide resolved
@sdelamo
Copy link
Contributor

sdelamo commented Mar 4, 2022

build(17) seems frozen. I am going to merge this.

@sdelamo sdelamo merged commit 36e34f3 into master Mar 4, 2022
@sdelamo sdelamo deleted the update-build branch March 4, 2022 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relates-to: build label for issues related to the build file or CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants