From bb2eeccaef60cd27481c13573aad44b34f9cd8cd Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <edouard.dupin@proton.me>
Date: Sat, 24 May 2025 00:24:25 +0200
Subject: [PATCH] [FIX] arbo

---
 lutin_org-atriasoft-iogami.py                 |  2 -
 pom.xml                                       | 50 ++++++++++++-------
 .../org/atriasoft/iogami/IOgami.java          |  0
 src/module-info.java                          | 13 -----
 4 files changed, 33 insertions(+), 32 deletions(-)
 rename src/{ => main}/org/atriasoft/iogami/IOgami.java (100%)
 delete mode 100644 src/module-info.java

diff --git a/lutin_org-atriasoft-iogami.py b/lutin_org-atriasoft-iogami.py
index bc6cba0..27ed3aa 100644
--- a/lutin_org-atriasoft-iogami.py
+++ b/lutin_org-atriasoft-iogami.py
@@ -33,8 +33,6 @@ def configure(target, my_module):
 	my_module.add_src_file([
 	    'src/module-info.java',
 	    'src/org/atriasoft/iogami/IOgami.java',
-	    'src/org/atriasoft/iogami/internal/LOGGER.java',
-
 	    ])
 	my_module.add_path('src/', type='java')
 	
diff --git a/pom.xml b/pom.xml
index e0a6639..770f9ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.atriasoft</groupId>
   <artifactId>io-gami</artifactId>
   <version>0.1.0</version>
-	<properties>
-		<maven.compiler.version>3.13.0</maven.compiler.version>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-		<maven.dependency.version>3.1.1</maven.dependency.version>
-	</properties>
+	<licenses>
+		<license>
+			<name>Mozilla Public License 2.0</name>
+			<url>https://opensource.org/licenses/MPL-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>dev1</id>
+			<name>Edouard DUPIN</name>
+			<email>edouard.dupin@proton.me</email>
+			<roles>
+				<role>Lead Developer</role>
+			</roles>
+		</developer>
+	</developers>
 
 	<repositories>
 	  <repository>
@@ -51,7 +63,7 @@
 		<dependency>
 		    <groupId>org.junit.jupiter</groupId>
 		    <artifactId>junit-jupiter-api</artifactId>
-		    <version>5.11.0-M2</version>
+		    <version>5.12.2</version>
 		    <scope>test</scope>
 		</dependency>
 		<dependency>
@@ -60,20 +72,24 @@
 			<version>2.1.0-alpha1</version>
 			<scope>test</scope>
 		</dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.atriasoft</groupId>
+			<artifactId>etk</artifactId>
+			<version>0.1.0</version>
+		</dependency>
+	</dependencies>
 
 	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test/src</testSourceDirectory>
+		<sourceDirectory>src/main</sourceDirectory>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven.compiler.version}</version>
+				<version>3.14.0</version>
 				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
-					<!--<encoding>${project.build.sourceEncoding}</encoding>-->
+					<source>21</source>
+					<target>21</target>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<!-- Create the source bundle -->
@@ -94,7 +110,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.5</version>
 			</plugin>
 		    <plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -113,7 +129,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>private</show>
 					<nohelp>true</nohelp>
@@ -127,7 +143,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>public</show>
 				</configuration>
diff --git a/src/org/atriasoft/iogami/IOgami.java b/src/main/org/atriasoft/iogami/IOgami.java
similarity index 100%
rename from src/org/atriasoft/iogami/IOgami.java
rename to src/main/org/atriasoft/iogami/IOgami.java
diff --git a/src/module-info.java b/src/module-info.java
deleted file mode 100644
index 5f8831c..0000000
--- a/src/module-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/** Basic module interface.
- *
- * @author Edouard DUPIN */
-
-open module org.atriasoft.iogami {
-	exports org.atriasoft.iogami;
-
-	requires transitive org.atriasoft.etk;
-	requires org.atriasoft.esvg;
-	requires org.atriasoft.pngdecoder;
-	requires org.atriasoft.pngencoder;
-	requires transitive org.atriasoft.egami;
-}