Merge pull request #45 from sciencesakura/refactor_pom

Upgrade POI 5.2.3->5.2.5 and others
sciencesakura · Mar 21, 2024 · e756955 · e756955
2 parents 2b7d18c + 32accd7
commit e756955
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 66 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,6 @@
     <dependency>
       <groupId>com.ninja-squad</groupId>
       <artifactId>DbSetup</artifactId>
-      <version>2.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
@@ -32,8 +31,7 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>24.0.1</version>
-      <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -61,6 +59,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
           <propertyExpansion>
@@ -69,6 +68,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -79,12 +79,14 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <reportOutputDirectory>${project.basedir}/../docs</reportOutputDirectory>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
       <plugin>

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -18,13 +18,6 @@
     <dependency>
       <groupId>com.ninja-squad</groupId>
       <artifactId>DbSetup-kotlin</artifactId>
-      <version>2.1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.sciencesakura</groupId>
@@ -39,7 +32,6 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>${kotlin.version}</version>
     </dependency>
 
     <dependency>
@@ -69,6 +61,7 @@
     <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -79,6 +72,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
       <plugin>

diff --git a/kotlin/src/main/kotlin/com/sciencesakura/dbsetup/spreadsheet/Functions.kt b/kotlin/src/main/kotlin/com/sciencesakura/dbsetup/spreadsheet/Functions.kt
@@ -42,7 +42,10 @@ fun DbSetupBuilder.excel(location: String) {
  * @param configure the function used to configure the Excel import
  * @throws IllegalArgumentException if the source file was not found
  */
-fun DbSetupBuilder.excel(location: String, configure: Import.Builder.() -> Unit) {
+fun DbSetupBuilder.excel(
+    location: String,
+    configure: Import.Builder.() -> Unit,
+) {
     val excelBuilder = Import.excel(location)
     excelBuilder.configure()
     execute(excelBuilder.build())

diff --git a/kotlin/src/test/kotlin/com/sciencesakura/dbsetup/spreadsheet/ExcelTest.kt b/kotlin/src/test/kotlin/com/sciencesakura/dbsetup/spreadsheet/ExcelTest.kt
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 class ExcelTest {
-
     val url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"
 
     val username = "sa"
@@ -43,20 +42,22 @@ class ExcelTest {
 
     @BeforeEach
     fun setUp() {
-        val table_11 = """
+        val table11 =
+            """
             create table if not exists table_11 (
               id integer primary key,
               name varchar(100)
             )
-        """.trimIndent()
-        val table_12 = """
+            """.trimIndent()
+        val table12 =
+            """
             create table if not exists table_12 (
               id integer primary key,
               name varchar(100)
             )
-        """.trimIndent()
+            """.trimIndent()
         dbSetup(destination) {
-            sql(table_11, table_12)
+            sql(table11, table12)
             truncate("table_11", "table_12")
         }.launch()
     }