change project structure

BoBkiNN · Aug 10, 2024 · df0a8ab · df0a8ab
1 parent 93c8d4f
commit df0a8ab
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 92 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -0,0 +1,40 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>xyz.bobkinn</groupId>
+        <artifactId>indigodataio-parent</artifactId>
+        <version>3.0.0</version>
+    </parent>
+
+    <artifactId>indigodataio</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>24.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.26</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/.../xyz/bobkinn/indigodataio/DataHolder.java → .../xyz/bobkinn/indigodataio/DataHolder.java b/.../xyz/bobkinn/indigodataio/DataHolder.java → .../xyz/bobkinn/indigodataio/DataHolder.java
diff --git a/...z/bobkinn/indigodataio/ImmutablePair.java → ...z/bobkinn/indigodataio/ImmutablePair.java b/...z/bobkinn/indigodataio/ImmutablePair.java → ...z/bobkinn/indigodataio/ImmutablePair.java
diff --git a/.../xyz/bobkinn/indigodataio/MapBuilder.java → .../xyz/bobkinn/indigodataio/MapBuilder.java b/.../xyz/bobkinn/indigodataio/MapBuilder.java → .../xyz/bobkinn/indigodataio/MapBuilder.java
diff --git a/...yz/bobkinn/indigodataio/NestedKeyMap.java → ...yz/bobkinn/indigodataio/NestedKeyMap.java b/...yz/bobkinn/indigodataio/NestedKeyMap.java → ...yz/bobkinn/indigodataio/NestedKeyMap.java
diff --git a/.../xyz/bobkinn/indigodataio/NumberUtil.java → .../xyz/bobkinn/indigodataio/NumberUtil.java b/.../xyz/bobkinn/indigodataio/NumberUtil.java → .../xyz/bobkinn/indigodataio/NumberUtil.java
diff --git a/...n/java/xyz/bobkinn/indigodataio/Pair.java → ...n/java/xyz/bobkinn/indigodataio/Pair.java b/...n/java/xyz/bobkinn/indigodataio/Pair.java → ...n/java/xyz/bobkinn/indigodataio/Pair.java
diff --git a/...xyz/bobkinn/indigodataio/ops/BaseMap.java → ...xyz/bobkinn/indigodataio/ops/BaseMap.java b/...xyz/bobkinn/indigodataio/ops/BaseMap.java → ...xyz/bobkinn/indigodataio/ops/BaseMap.java
diff --git a/.../xyz/bobkinn/indigodataio/ops/MapOps.java → .../xyz/bobkinn/indigodataio/ops/MapOps.java b/.../xyz/bobkinn/indigodataio/ops/MapOps.java → .../xyz/bobkinn/indigodataio/ops/MapOps.java
diff --git a/...xyz/bobkinn/indigodataio/ops/TypeOps.java → ...xyz/bobkinn/indigodataio/ops/TypeOps.java b/...xyz/bobkinn/indigodataio/ops/TypeOps.java → ...xyz/bobkinn/indigodataio/ops/TypeOps.java
diff --git a/src/test/java/map/MapTest.java → core/src/test/java/map/MapTest.java b/src/test/java/map/MapTest.java → core/src/test/java/map/MapTest.java
diff --git a/indigodataio-gson/pom.xml b/indigodataio-gson/pom.xml
@@ -4,7 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>xyz.bobkinn</groupId>
+    <parent>
+        <groupId>xyz.bobkinn</groupId>
+        <artifactId>indigodataio-parent</artifactId>
+        <version>3.0.0</version>
+    </parent>
+
     <artifactId>indigodataio-gson</artifactId>
     <version>2.0.0</version>
 
@@ -18,7 +23,7 @@
         <dependency>
             <groupId>xyz.bobkinn</groupId>
             <artifactId>indigodataio</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -40,67 +45,4 @@
         </dependency>
     </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/BoBkiNN/IndigoDataIo</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -5,34 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>xyz.bobkinn</groupId>
-    <artifactId>indigodataio</artifactId>
+    <artifactId>indigodataio-parent</artifactId>
     <version>3.0.0</version>
+    <packaging>pom</packaging>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>core</module>
+        <module>indigodataio-gson</module>
+    </modules>
 
     <distributionManagement>
         <repository>
@@ -67,7 +47,7 @@
                 <executions>
                     <execution>
                         <id>default-deploy</id>
-                        <phase>install</phase>
+                        <phase>deploy</phase>
                         <goals>
                             <goal>deploy</goal>
                         </goals>