From ecb221bff81b66f33b2f02a6214110166464b7de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Mon, 17 Oct 2022 16:47:14 +0200
Subject: [PATCH] Modify tests to check --exclude-config works as expected

Can now be checked by running OfficialMetadataRepoFunctionalTest for Gradle
and OfficialMetadataRepositoryFunctionalTest for Maven.

See gh-340
---
 .../metadata-repo-integration/build.gradle    |  9 ++++--
 .../gradle.properties                         |  3 ++
 samples/metadata-repo-integration/pom.xml     | 31 +++++++++++++++++--
 .../metadata-repo-integration/settings.gradle |  2 +-
 .../java/org/graalvm/example/Example.java     |  9 ++++++
 .../java/org/graalvm/example/H2Example.java   |  2 +-
 .../org/graalvm/example/NettyExample.java     | 11 +++++++
 7 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 samples/metadata-repo-integration/src/main/java/org/graalvm/example/Example.java
 create mode 100644 samples/metadata-repo-integration/src/main/java/org/graalvm/example/NettyExample.java

diff --git a/samples/metadata-repo-integration/build.gradle b/samples/metadata-repo-integration/build.gradle
index 2bd28d6da..9dc689676 100644
--- a/samples/metadata-repo-integration/build.gradle
+++ b/samples/metadata-repo-integration/build.gradle
@@ -49,16 +49,21 @@ repositories {
 }
 
 application {
-    mainClass.set('org.graalvm.example.H2Example')
+    mainClass.set('org.graalvm.example.Example')
 }
 
 String h2_version = getProperty("h2.version")
 String netty_version = getProperty("netty.version")
-
+String logback_version = getProperty("logback.version")
+String log4j_version = getProperty("log4j.version")
+String slf4j_version = getProperty("slf4j.version")
 
 dependencies {
     implementation("com.h2database:h2:$h2_version")
     implementation("io.netty:netty-codec-http:$netty_version")
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    implementation("org.apache.logging.log4j:log4j-to-slf4j:$log4j_version")
+    implementation("org.slf4j:jul-to-slf4j:$slf4j_version")
 }
 
 graalvmNative {
diff --git a/samples/metadata-repo-integration/gradle.properties b/samples/metadata-repo-integration/gradle.properties
index a80ae9995..807b408c2 100644
--- a/samples/metadata-repo-integration/gradle.properties
+++ b/samples/metadata-repo-integration/gradle.properties
@@ -1,3 +1,6 @@
 native.gradle.plugin.version = 0.9.16-SNAPSHOT
 h2.version = 2.1.210
 netty.version = 4.1.80.Final
+logback.version = 1.4.4
+log4j.version = 2.19.0
+slf4j.version = 2.0.3
diff --git a/samples/metadata-repo-integration/pom.xml b/samples/metadata-repo-integration/pom.xml
index f91ed47b1..df22c58cc 100644
--- a/samples/metadata-repo-integration/pom.xml
+++ b/samples/metadata-repo-integration/pom.xml
@@ -54,8 +54,13 @@
         <native.maven.plugin.version>0.9.16-SNAPSHOT</native.maven.plugin.version>
         <junit.platform.native.version>0.9.16-SNAPSHOT</junit.platform.native.version>
         <h2.version>2.1.210</h2.version>
-        <imageName>h2-demo</imageName>
-        <mainClass>org.graalvm.example.H2Example</mainClass>
+        <netty.version>4.1.80.Final</netty.version>
+        <logback.version>1.4.4</logback.version>
+        <log4j.version>2.19.0</log4j.version>
+        <slf4j.version>2.0.3</slf4j.version>
+
+        <imageName>metadata-repo-demo</imageName>
+        <mainClass>org.graalvm.example.Example</mainClass>
     </properties>
 
     <dependencies>
@@ -64,6 +69,26 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -118,7 +143,7 @@
                             <!-- tag::metadata-versioned[] -->
                             <metadataRepository>
                                 <enabled>true</enabled>
-                                <version>0.1.0</version>
+                                <version>0.2.3</version>
                             </metadataRepository>
                             <!-- end::metadata-versioned[] -->
                         </configuration>
diff --git a/samples/metadata-repo-integration/settings.gradle b/samples/metadata-repo-integration/settings.gradle
index 5a909b526..b0a46b65a 100644
--- a/samples/metadata-repo-integration/settings.gradle
+++ b/samples/metadata-repo-integration/settings.gradle
@@ -8,4 +8,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'h2-demo'
+rootProject.name = 'metadata-repo-demo'
diff --git a/samples/metadata-repo-integration/src/main/java/org/graalvm/example/Example.java b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/Example.java
new file mode 100644
index 000000000..04f2c5815
--- /dev/null
+++ b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/Example.java
@@ -0,0 +1,9 @@
+package org.graalvm.example;
+
+public class Example {
+
+	public static void main(String[] args) throws Exception {
+		H2Example.test();
+		NettyExample.test();
+	}
+}
diff --git a/samples/metadata-repo-integration/src/main/java/org/graalvm/example/H2Example.java b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/H2Example.java
index b743611ae..5ad8a764b 100644
--- a/samples/metadata-repo-integration/src/main/java/org/graalvm/example/H2Example.java
+++ b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/H2Example.java
@@ -16,7 +16,7 @@ public class H2Example {
 
     public static final String JDBC_CONNECTION_URL = "jdbc:h2:./data/test";
 
-    public static void main(String[] args) throws Exception {
+    public static void test() throws Exception {
         // Cleanup
         withConnection(JDBC_CONNECTION_URL, connection -> {
             connection.prepareStatement("DROP TABLE IF EXISTS customers").execute();
diff --git a/samples/metadata-repo-integration/src/main/java/org/graalvm/example/NettyExample.java b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/NettyExample.java
new file mode 100644
index 000000000..f1317c99a
--- /dev/null
+++ b/samples/metadata-repo-integration/src/main/java/org/graalvm/example/NettyExample.java
@@ -0,0 +1,11 @@
+package org.graalvm.example;
+
+import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
+
+public class NettyExample {
+
+	public static void test() {
+		ServerCookieDecoder.STRICT.decode("");
+	}
+
+}