Skip to content

Commit 77811a7

Browse files
authored
Repro mill init test failures (#6556)
Follow up for #6441
1 parent b60bdbf commit 77811a7

File tree

7 files changed

+69
-40
lines changed

7 files changed

+69
-40
lines changed

integration/migrating/init/resources/golden/maven/netty

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ Module dependencies of varhandle-stub:
11921192
"org.jctools:jctools-core:4.0.5",
11931193
"org.slf4j:slf4j-api:2.0.13",
11941194
"commons-logging:commons-logging:1.3.4",
1195-
"org.apache.logging.log4j:log4j-1.2-api:2.23.1;exclude=javax.mail:mail;exclude=javax.jms:jms;exclude=com.sun.jdmk:jmxtools;exclude=com.sun.jmx:jmxri",
1195+
"org.apache.logging.log4j:log4j-1.2-api:2.23.1;exclude=com.sun.jdmk:jmxtools;exclude=com.sun.jmx:jmxri;exclude=javax.jms:jms;exclude=javax.mail:mail",
11961196
"org.apache.logging.log4j:log4j-api:2.23.1",
11971197
"io.projectreactor.tools:blockhound:1.0.13.RELEASE"
11981198
],
@@ -1582,87 +1582,87 @@ Module dependencies of varhandle-stub:
15821582
"buffer.runMvnDeps": [],
15831583
"buffer.test.runMvnDeps": [
15841584
"org.graalvm.nativeimage:svm:19.3.6",
1585-
"org.junit.platform:junit-platform-launcher"
1585+
"org.junit.platform:junit-platform-launcher:"
15861586
],
15871587
"codec.runMvnDeps": [],
15881588
"codec-base.runMvnDeps": [],
15891589
"codec-base.test.runMvnDeps": [
1590-
"org.junit.platform:junit-platform-launcher"
1590+
"org.junit.platform:junit-platform-launcher:"
15911591
],
15921592
"codec-classes-quic.runMvnDeps": [],
15931593
"codec-compression.runMvnDeps": [],
15941594
"codec-compression.test.runMvnDeps": [
1595-
"org.junit.platform:junit-platform-launcher"
1595+
"org.junit.platform:junit-platform-launcher:"
15961596
],
15971597
"codec-dns.runMvnDeps": [],
15981598
"codec-dns.test.runMvnDeps": [
1599-
"org.junit.platform:junit-platform-launcher"
1599+
"org.junit.platform:junit-platform-launcher:"
16001600
],
16011601
"codec-haproxy.runMvnDeps": [],
16021602
"codec-haproxy.test.runMvnDeps": [
1603-
"org.junit.platform:junit-platform-launcher"
1603+
"org.junit.platform:junit-platform-launcher:"
16041604
],
16051605
"codec-http.runMvnDeps": [],
16061606
"codec-http.test.runMvnDeps": [
1607-
"org.junit.platform:junit-platform-launcher"
1607+
"org.junit.platform:junit-platform-launcher:"
16081608
],
16091609
"codec-http2.runMvnDeps": [],
16101610
"codec-http2.test.runMvnDeps": [
1611-
"org.junit.platform:junit-platform-launcher"
1611+
"org.junit.platform:junit-platform-launcher:"
16121612
],
16131613
"codec-http3.runMvnDeps": [],
16141614
"codec-http3.test.runMvnDeps": [
16151615
"org.jetbrains:annotations:26.0.2",
16161616
"com.google.code.findbugs:jsr305:3.0.2",
1617-
"org.junit.platform:junit-platform-launcher"
1617+
"org.junit.platform:junit-platform-launcher:"
16181618
],
16191619
"codec-marshalling.runMvnDeps": [],
16201620
"codec-marshalling.test.runMvnDeps": [
1621-
"org.junit.platform:junit-platform-launcher"
1621+
"org.junit.platform:junit-platform-launcher:"
16221622
],
16231623
"codec-memcache.runMvnDeps": [],
16241624
"codec-memcache.test.runMvnDeps": [
1625-
"org.junit.platform:junit-platform-launcher"
1625+
"org.junit.platform:junit-platform-launcher:"
16261626
],
16271627
"codec-mqtt.runMvnDeps": [],
16281628
"codec-mqtt.test.runMvnDeps": [
1629-
"org.junit.platform:junit-platform-launcher"
1629+
"org.junit.platform:junit-platform-launcher:"
16301630
],
16311631
"codec-native-quic.runMvnDeps": [],
16321632
"codec-native-quic.test.runMvnDeps": [
16331633
"org.jetbrains:annotations:26.0.2",
1634-
"org.junit.platform:junit-platform-launcher"
1634+
"org.junit.platform:junit-platform-launcher:"
16351635
],
16361636
"codec-protobuf.runMvnDeps": [],
16371637
"codec-protobuf.test.runMvnDeps": [
1638-
"org.junit.platform:junit-platform-launcher"
1638+
"org.junit.platform:junit-platform-launcher:"
16391639
],
16401640
"codec-redis.runMvnDeps": [],
16411641
"codec-redis.test.runMvnDeps": [
1642-
"org.junit.platform:junit-platform-launcher"
1642+
"org.junit.platform:junit-platform-launcher:"
16431643
],
16441644
"codec-smtp.runMvnDeps": [],
16451645
"codec-smtp.test.runMvnDeps": [
1646-
"org.junit.platform:junit-platform-launcher"
1646+
"org.junit.platform:junit-platform-launcher:"
16471647
],
16481648
"codec-socks.runMvnDeps": [],
16491649
"codec-socks.test.runMvnDeps": [
1650-
"org.junit.platform:junit-platform-launcher"
1650+
"org.junit.platform:junit-platform-launcher:"
16511651
],
16521652
"codec-stomp.runMvnDeps": [],
16531653
"codec-stomp.test.runMvnDeps": [
1654-
"org.junit.platform:junit-platform-launcher"
1654+
"org.junit.platform:junit-platform-launcher:"
16551655
],
16561656
"codec-xml.runMvnDeps": [],
16571657
"codec-xml.test.runMvnDeps": [
1658-
"org.junit.platform:junit-platform-launcher"
1658+
"org.junit.platform:junit-platform-launcher:"
16591659
],
16601660
"common.runMvnDeps": [],
16611661
"common.test.runMvnDeps": [
16621662
"org.graalvm.nativeimage:svm:19.3.6",
16631663
"org.jboss:jdk-misc:3.Final",
16641664
"org.jetbrains:annotations:26.0.2",
1665-
"org.junit.platform:junit-platform-launcher"
1665+
"org.junit.platform:junit-platform-launcher:"
16661666
],
16671667
"dev-tools.runMvnDeps": [],
16681668
"example.runMvnDeps": [
@@ -1683,37 +1683,37 @@ Module dependencies of varhandle-stub:
16831683
],
16841684
"handler.test.runMvnDeps": [
16851685
"io.netty:netty-tcnative-boringssl-static:2.0.73.Final",
1686-
"org.junit.platform:junit-platform-launcher"
1686+
"org.junit.platform:junit-platform-launcher:"
16871687
],
16881688
"handler-proxy.runMvnDeps": [],
16891689
"handler-proxy.test.runMvnDeps": [
1690-
"org.junit.platform:junit-platform-launcher"
1690+
"org.junit.platform:junit-platform-launcher:"
16911691
],
16921692
"handler-ssl-ocsp.runMvnDeps": [],
16931693
"handler-ssl-ocsp.test.runMvnDeps": [
16941694
"org.bouncycastle:bcpkix-jdk18on:1.80",
1695-
"org.junit.platform:junit-platform-launcher"
1695+
"org.junit.platform:junit-platform-launcher:"
16961696
],
16971697
"jfr-stub.runMvnDeps": [],
16981698
"microbench.runMvnDeps": [
16991699
"io.netty:netty-tcnative-boringssl-static:2.0.73.Final"
17001700
],
17011701
"pkitesting.runMvnDeps": [],
17021702
"pkitesting.test.runMvnDeps": [
1703-
"org.junit.platform:junit-platform-launcher"
1703+
"org.junit.platform:junit-platform-launcher:"
17041704
],
17051705
"resolver.runMvnDeps": [],
17061706
"resolver.test.runMvnDeps": [
1707-
"org.junit.platform:junit-platform-launcher"
1707+
"org.junit.platform:junit-platform-launcher:"
17081708
],
17091709
"resolver-dns.runMvnDeps": [],
17101710
"resolver-dns.test.runMvnDeps": [
1711-
"org.junit.platform:junit-platform-launcher"
1711+
"org.junit.platform:junit-platform-launcher:"
17121712
],
17131713
"resolver-dns-classes-macos.runMvnDeps": [],
17141714
"resolver-dns-native-macos.runMvnDeps": [],
17151715
"resolver-dns-native-macos.test.runMvnDeps": [
1716-
"org.junit.platform:junit-platform-launcher"
1716+
"org.junit.platform:junit-platform-launcher:"
17171717
],
17181718
"runMvnDeps": [],
17191719
"testsuite.runMvnDeps": [
@@ -1723,14 +1723,14 @@ Module dependencies of varhandle-stub:
17231723
"testsuite-http2.runMvnDeps": [],
17241724
"testsuite-jpms.runMvnDeps": [],
17251725
"testsuite-jpms.test.runMvnDeps": [
1726-
"org.junit.platform:junit-platform-launcher"
1726+
"org.junit.platform:junit-platform-launcher:"
17271727
],
17281728
"testsuite-karaf.runMvnDeps": [
17291729
"org.apache.karaf.features:framework:4.4.8;classifier=features;type=xml"
17301730
],
17311731
"testsuite-native.runMvnDeps": [],
17321732
"testsuite-native.test.runMvnDeps": [
1733-
"org.junit.platform:junit-platform-launcher"
1733+
"org.junit.platform:junit-platform-launcher:"
17341734
],
17351735
"testsuite-native-image.runMvnDeps": [],
17361736
"testsuite-native-image-client.runMvnDeps": [],
@@ -1739,47 +1739,47 @@ Module dependencies of varhandle-stub:
17391739
"testsuite-osgi.test.runMvnDeps": [],
17401740
"testsuite-shading.runMvnDeps": [],
17411741
"testsuite-shading.test.runMvnDeps": [
1742-
"org.junit.platform:junit-platform-launcher"
1742+
"org.junit.platform:junit-platform-launcher:"
17431743
],
17441744
"transport.runMvnDeps": [],
17451745
"transport.test.runMvnDeps": [
1746-
"org.junit.platform:junit-platform-launcher"
1746+
"org.junit.platform:junit-platform-launcher:"
17471747
],
17481748
"transport-blockhound-tests.runMvnDeps": [
17491749
"io.netty:netty-tcnative-boringssl-static:2.0.73.Final"
17501750
],
17511751
"transport-blockhound-tests.test.runMvnDeps": [
17521752
"io.netty:netty-tcnative-boringssl-static:2.0.73.Final",
1753-
"org.junit.platform:junit-platform-launcher"
1753+
"org.junit.platform:junit-platform-launcher:"
17541754
],
17551755
"transport-classes-epoll.runMvnDeps": [],
17561756
"transport-classes-io_uring.runMvnDeps": [],
17571757
"transport-classes-kqueue.runMvnDeps": [],
17581758
"transport-native-epoll.runMvnDeps": [],
17591759
"transport-native-epoll.test.runMvnDeps": [
1760-
"org.junit.platform:junit-platform-launcher"
1760+
"org.junit.platform:junit-platform-launcher:"
17611761
],
17621762
"transport-native-io_uring.runMvnDeps": [],
17631763
"transport-native-io_uring.test.runMvnDeps": [
1764-
"org.junit.platform:junit-platform-launcher"
1764+
"org.junit.platform:junit-platform-launcher:"
17651765
],
17661766
"transport-native-kqueue.runMvnDeps": [],
17671767
"transport-native-kqueue.test.runMvnDeps": [
1768-
"org.junit.platform:junit-platform-launcher"
1768+
"org.junit.platform:junit-platform-launcher:"
17691769
],
17701770
"transport-native-unix-common.runMvnDeps": [],
17711771
"transport-native-unix-common.test.runMvnDeps": [
1772-
"org.junit.platform:junit-platform-launcher"
1772+
"org.junit.platform:junit-platform-launcher:"
17731773
],
17741774
"transport-native-unix-common-tests.runMvnDeps": [],
17751775
"transport-rxtx.runMvnDeps": [],
17761776
"transport-sctp.runMvnDeps": [],
17771777
"transport-sctp.test.runMvnDeps": [
1778-
"org.junit.platform:junit-platform-launcher"
1778+
"org.junit.platform:junit-platform-launcher:"
17791779
],
17801780
"transport-udt.runMvnDeps": [],
17811781
"transport-udt.test.runMvnDeps": [
1782-
"org.junit.platform:junit-platform-launcher"
1782+
"org.junit.platform:junit-platform-launcher:"
17831783
],
17841784
"varhandle-stub.runMvnDeps": []
17851785
}

integration/migrating/init/src/MillInitMavenTests.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ object MillInitMavenTests extends MillInitImportTestSuite {
1414
test("netty") - checkImport(
1515
repoName = "netty",
1616
initArgs = Seq("--mill-jvm-id", "17"),
17-
// Comment this out for now to get CI passeing
18-
// configsGoldenFile = "golden/maven/netty",
17+
configsGoldenFile = "golden/maven/netty",
1918
passingTasks = Seq("common.compile")
2019
)
2120
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
mill-version: SNAPSHOT
2+
mill-jvm-version: system
3+
extends: MavenModule
4+
mvnDeps:
5+
- com.google.guava:guava:28.0-jre
6+
javacOptions: [-source, 11, -target, 11]
7+
repositories: [https://jcenter.bintray.com/]
8+
9+
object test:
10+
extends: [MavenTests, TestModule.TestNg]
11+
mvnDeps:
12+
- org.testng:testng:6.14.3
13+
javacOptions: [-source, 11, -target, 11]
14+
testParallelism: false
15+
testSandboxWorkingDir: false
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: millbuild.ProjectBaseModule
2+
moduleDeps: [utilities]
3+
mvnDeps:
4+
- org.apache.commons:commons-text
5+
6+
object test:
7+
extends: ProjectBaseTests
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mill-version: SNAPSHOT
2+
mill-jvm-version: system
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
extends: millbuild.ProjectBaseModule
2+
3+
object test:
4+
extends: ProjectBaseTests
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
extends: millbuild.ProjectBaseModule
2+
moduleDeps: [list]

0 commit comments

Comments
 (0)