Merge pull request #130 from avaje/feature/flatten-module-structure

Flatten module structure

Author: rbygrave

http-client/gson-adapter/pom.xml renamed to http-client-gson-adapter/pom.xml

@@ -12,11 +12,6 @@
   <artifactId>avaje-http-client-gson</artifactId>
   <version>1.23-SNAPSHOT</version>
 
-  <scm>
-    <developerConnection>scm:git:[email protected]:avaje/avaje-http-client.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
   <dependencies>
 
     <dependency>

http-client/gson-adapter/src/main/java/io/avaje/http/client/gson/GsonBodyAdapter.java renamed to http-client-gson-adapter/src/main/java/io/avaje/http/client/gson/GsonBodyAdapter.java

@@ -4,21 +4,154 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.8</version>
+    <version>3.9</version>
+    <relativePath />
   </parent>
 
   <groupId>io.avaje</groupId>
-  <artifactId>avaje-http-client-parent</artifactId>
-  <version>1</version>
-  <packaging>pom</packaging>
+  <artifactId>avaje-http-client</artifactId>
+  <version>1.23-SNAPSHOT</version>
 
-  <!-- reactor only, not really a parent pom -->
+  <scm>
+    <developerConnection>scm:git:[email protected]:avaje/avaje-http-client.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
 
-  <modules>
-    <module>client</module>
-    <module>gson-adapter</module>
-    <module>test</module>
-  </modules>
+  <properties>
+    <surefire.useModulePath>false</surefire.useModulePath>
+  </properties>
 
-</project>
+  <dependencies>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.14.1</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jsonb</artifactId>
+      <version>1.1-RC3</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject</artifactId>
+      <version>8.10</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- test dependencies  -->
+
+<!--    <dependency>-->
+<!--      <groupId>io.avaje</groupId>-->
+<!--      <artifactId>avaje-slf4j-jpl</artifactId>-->
+<!--      <version>1.1</version>-->
+<!--      <scope>test</scope>-->
+<!--    </dependency>-->
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog-slf4j</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.javalin</groupId>
+      <artifactId>javalin</artifactId>
+      <version>5.2.0</version>
+      <scope>test</scope>
+    </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-api</artifactId>
+      <version>1.20</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-hibernate-validator</artifactId>
+      <version>2.8</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>logback</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- test annotation processors -->
+<!--    <dependency>-->
+<!--      <groupId>io.avaje</groupId>-->
+<!--      <artifactId>avaje-inject-generator</artifactId>-->
+<!--      <version>8.6</version>-->
+<!--      <scope>test</scope>-->
+<!--    </dependency>-->
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <configuration>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>io.avaje</groupId>
+                  <artifactId>avaje-inject-generator</artifactId>
+                  <version>8.10</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M6</version>
+<!--        <configuration>-->
+<!--          <argLine>-->
+<!--            &#45;&#45;add-modules com.fasterxml.jackson.databind-->
+<!--            &#45;&#45;add-modules io.avaje.jsonb-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/io.avaje.http.client=ALL-UNNAMED-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.webserver=ALL-UNNAMED-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.github=ALL-UNNAMED-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.webserver=com.fasterxml.jackson.databind-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.github=com.fasterxml.jackson.databind-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.github=io.avaje.jsonb-->
+<!--            &#45;&#45;add-opens io.avaje.http.client/org.example.github=io.avaje.inject-->
+<!--          </argLine>-->
+<!--        </configuration>-->
+      </plugin>
+
+    </plugins>
+  </build>
+</project>

http-client/gson-adapter/src/test/java/io/avaje/http/client/gson/Foo.java renamed to http-client-gson-adapter/src/test/java/io/avaje/http/client/gson/Foo.java

@@ -145,7 +145,7 @@ public interface HttpClientRequest {
    * <pre>{code
    *
    *  HttpResponse<String> res = clientContext.request()
-   *       .url("http://127.0.0.1:8887")
+   *       .url("http://127.0.0.1:8889")
    *       .path("hello")
    *       .GET()
    *       .asString();

http-client/gson-adapter/src/test/java/io/avaje/http/client/gson/GsonBodyAdapterTest.java renamed to http-client-gson-adapter/src/test/java/io/avaje/http/client/gson/GsonBodyAdapterTest.java

@@ -16,8 +16,8 @@ public class BaseWebTest {
 
   @BeforeAll
   public static void init() {
-    webServer = App.start(8887);
-    baseUrl = "http://localhost:8887";
+    webServer = App.start(8889);
+    baseUrl = "http://localhost:8889";
   }
 
   @AfterAll