From 975116c4a5dcca7325f67ae14bcf24088b6ad448 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 4 Apr 2025 10:58:28 +0200
Subject: [PATCH] Bump sop-java to 10.1.1-SNAPSHOT and remove workaround for
 native image configuration

---
 bc-sop-cli/pom.xml | 65 ----------------------------------------------
 pom.xml            |  6 ++---
 2 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/bc-sop-cli/pom.xml b/bc-sop-cli/pom.xml
index f869df2..a8b4868 100644
--- a/bc-sop-cli/pom.xml
+++ b/bc-sop-cli/pom.xml
@@ -117,71 +117,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- Manually configure reflections, resources and dynamic proxies -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>generateGraalReflectionConfig</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <includeProjectDependencies>true</includeProjectDependencies>
-                            <includePluginDependencies>true</includePluginDependencies>
-                            <mainClass>picocli.codegen.aot.graalvm.ReflectionConfigGenerator</mainClass>
-                            <arguments>
-                                <argument>--output=${artifactId}/target/classes/META-INF/native-image/${project.groupId}/${project.artifactId}/reflect-config.json</argument>
-                                <argument>sop.cli.picocli.SopCLI</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>generateGraalDynamicProxyConfig</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <includeProjectDependencies>true</includeProjectDependencies>
-                            <includePluginDependencies>true</includePluginDependencies>
-                            <mainClass>picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator</mainClass>
-                            <arguments>
-                                <argument>--output=${artifactId}/target/classes/META-INF/native-image/${project.groupId}/${project.artifactId}/proxy-config.json</argument>
-                                <argument>sop.cli.picocli.SopCLI</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>generateGraalResourceConfig</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <includeProjectDependencies>true</includeProjectDependencies>
-                            <includePluginDependencies>true</includePluginDependencies>
-                            <mainClass>picocli.codegen.aot.graalvm.ResourceConfigGenerator</mainClass>
-                            <arguments>
-                                <argument>--output=${artifactId}/target/classes/META-INF/native-image/${project.groupId}/${project.artifactId}/resource-config.json</argument>
-                                <argument>sop.cli.picocli.SopCLI</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>info.picocli</groupId>
-                        <artifactId>picocli-codegen</artifactId>
-                        <version>${picocli.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index e522f76..98384fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,17 +48,17 @@
             <dependency>
                 <groupId>org.pgpainless</groupId>
                 <artifactId>sop-java</artifactId>
-                <version>10.0.3-SNAPSHOT</version>
+                <version>10.1.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.pgpainless</groupId>
                 <artifactId>sop-java-picocli</artifactId>
-                <version>10.0.3-SNAPSHOT</version>
+                <version>10.1.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.pgpainless</groupId>
                 <artifactId>sop-java-testfixtures</artifactId>
-                <version>10.0.3-SNAPSHOT</version>
+                <version>10.1.1-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>