Fixes #35 - Change project into parent POM structure

manorrock · Nov 27, 2023 · 4beaac8 · 4beaac8
1 parent 50b6717
commit 4beaac8
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /nbproject/
 /target/
+/impl/target/
diff --git a/CODE_OF_CONDUCT.md → impl/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → impl/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md → impl/CONTRIBUTING.md b/CONTRIBUTING.md → impl/CONTRIBUTING.md
diff --git a/LICENSE → impl/LICENSE b/LICENSE → impl/LICENSE
diff --git a/README.md → impl/README.md b/README.md → impl/README.md
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -0,0 +1,62 @@
+<?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>com.manorrock.cheetah</groupId>
+        <artifactId>project</artifactId>
+        <version>23.5.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>cheetah-impl</artifactId>
+    <packaging>jar</packaging>
+    <name>Manorrock Cheetah</name>
+    <properties>
+        <!-- dependencies -->
+        <hamcrest-core.version>1.3</hamcrest-core.version>
+        <jakarta.version>10.0.0</jakarta.version>
+        <junit.version>4.13.2</junit.version>
+        <!-- other -->
+        <java.version>21</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- plugins -->
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <version>${jakarta.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>${hamcrest-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>tck</id>
+        </profile>
+    </profiles>
+</project>
diff --git a/...manorrock/cheetah/CheetahBeanManager.java → ...manorrock/cheetah/CheetahBeanManager.java b/...manorrock/cheetah/CheetahBeanManager.java → ...manorrock/cheetah/CheetahBeanManager.java
diff --git a/...ava/com/manorrock/cheetah/CheetahCDI.java → ...ava/com/manorrock/cheetah/CheetahCDI.java b/...ava/com/manorrock/cheetah/CheetahCDI.java → ...ava/com/manorrock/cheetah/CheetahCDI.java
diff --git a/...manorrock/cheetah/CheetahCDIProvider.java → ...manorrock/cheetah/CheetahCDIProvider.java b/...manorrock/cheetah/CheetahCDIProvider.java → ...manorrock/cheetah/CheetahCDIProvider.java
diff --git a/...h/CheetahServletContainerInitializer.java → ...h/CheetahServletContainerInitializer.java b/...h/CheetahServletContainerInitializer.java → ...h/CheetahServletContainerInitializer.java
diff --git a/...rrock/cheetah/CheetahBeanManagerTest.java → ...rrock/cheetah/CheetahBeanManagerTest.java b/...rrock/cheetah/CheetahBeanManagerTest.java → ...rrock/cheetah/CheetahBeanManagerTest.java
diff --git a/...rrock/cheetah/CheetahCDIProviderTest.java → ...rrock/cheetah/CheetahCDIProviderTest.java b/...rrock/cheetah/CheetahCDIProviderTest.java → ...rrock/cheetah/CheetahCDIProviderTest.java
diff --git a/...com/manorrock/cheetah/CheetahCDITest.java → ...com/manorrock/cheetah/CheetahCDITest.java b/...com/manorrock/cheetah/CheetahCDITest.java → ...com/manorrock/cheetah/CheetahCDITest.java
diff --git a/...eetahServletContainerInitializerTest.java → ...eetahServletContainerInitializerTest.java b/...eetahServletContainerInitializerTest.java → ...eetahServletContainerInitializerTest.java
diff --git a/pom.xml b/pom.xml
@@ -5,55 +5,11 @@
          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>com.manorrock.cheetah</groupId>
-    <artifactId>cheetah</artifactId>
+    <artifactId>project</artifactId>
     <version>23.5.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Manorrock Cheetah</name>
-    <properties>
-        <!-- dependencies -->
-        <hamcrest-core.version>1.3</hamcrest-core.version>
-        <jakarta.version>10.0.0</jakarta.version>
-        <junit.version>4.13.2</junit.version>
-        <!-- other -->
-        <java.version>21</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- plugins -->
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-web-api</artifactId>
-            <version>${jakarta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>${hamcrest-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <release>${java.version}</release>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>tck</id>
-        </profile>
-    </profiles>
+    <packaging>pom</packaging>
+    <name>Manorrock Cheetah - Project</name>
+    <modules>
+        <module>impl</module>
+    </modules>
 </project>