Fix Maven build.

scottaj · Jun 27, 2016 · c797458 · c797458
1 parent 2f133d3
commit c797458
Show file tree

Hide file tree

Showing 23 changed files with 142 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /auth-multitenancy-example.iml
 target/
 **/*.iml
+dependency-reduced-pom.xml
diff --git a/authentication-api/pom.xml b/authentication-api/pom.xml
@@ -13,8 +13,47 @@
   <dependencies>
     <dependency>
       <groupId>al.thisis</groupId>
-      <artifactId>auth-multitenancy-example</artifactId>
+      <artifactId>common</artifactId>
       <version>1.0</version>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <createDependencyReducedPom>true</createDependencyReducedPom>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>AuthenticationAPI</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/business-api/pom.xml b/business-api/pom.xml
@@ -13,10 +13,47 @@
   <dependencies>
     <dependency>
       <groupId>al.thisis</groupId>
-      <artifactId>auth-multitenancy-example</artifactId>
+      <artifactId>common</artifactId>
       <version>1.0</version>
     </dependency>
   </dependencies>
 
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <createDependencyReducedPom>true</createDependencyReducedPom>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>BusinessAPI</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/...middleware/security/CustomAuthFilter.java → ...middleware/security/CustomAuthFilter.java b/...middleware/security/CustomAuthFilter.java → ...middleware/security/CustomAuthFilter.java
diff --git a/...a/middleware/security/CustomAuthUser.java → ...a/middleware/security/CustomAuthUser.java b/...a/middleware/security/CustomAuthUser.java → ...a/middleware/security/CustomAuthUser.java
diff --git a/...dleware/security/CustomAuthenticator.java → ...dleware/security/CustomAuthenticator.java b/...dleware/security/CustomAuthenticator.java → ...dleware/security/CustomAuthenticator.java
diff --git a/...iddleware/security/CustomCredentials.java → ...iddleware/security/CustomCredentials.java b/...iddleware/security/CustomCredentials.java → ...iddleware/security/CustomCredentials.java
diff --git a/config.yml → common/config.yml b/config.yml → common/config.yml
diff --git a/common/pom.xml b/common/pom.xml
@@ -0,0 +1,52 @@
+<?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">
+  <parent>
+    <artifactId>auth-multitenancy-example</artifactId>
+    <groupId>al.thisis</groupId>
+    <version>1.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>common</artifactId>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <createDependencyReducedPom>true</createDependencyReducedPom>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>MigrationApp</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/java/ExampleConfig.java → common/src/main/java/ExampleConfig.java b/src/main/java/ExampleConfig.java → common/src/main/java/ExampleConfig.java
diff --git a/src/main/java/MigrationApp.java → common/src/main/java/MigrationApp.java b/src/main/java/MigrationApp.java → common/src/main/java/MigrationApp.java
diff --git a/src/main/java/api/Token.java → common/src/main/java/api/Token.java b/src/main/java/api/Token.java → common/src/main/java/api/Token.java
diff --git a/src/main/java/api/User.java → common/src/main/java/api/User.java b/src/main/java/api/User.java → common/src/main/java/api/User.java
diff --git a/src/main/java/api/Widget.java → common/src/main/java/api/Widget.java b/src/main/java/api/Widget.java → common/src/main/java/api/Widget.java
diff --git a/src/main/java/dao/TokenDAO.java → common/src/main/java/dao/TokenDAO.java b/src/main/java/dao/TokenDAO.java → common/src/main/java/dao/TokenDAO.java
diff --git a/src/main/java/dao/UserDAO.java → common/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java → common/src/main/java/dao/UserDAO.java
diff --git a/src/main/java/dao/WidgetDAO.java → common/src/main/java/dao/WidgetDAO.java b/src/main/java/dao/WidgetDAO.java → common/src/main/java/dao/WidgetDAO.java
diff --git a/src/main/java/dao/WidgetScope.java → common/src/main/java/dao/WidgetScope.java b/src/main/java/dao/WidgetScope.java → common/src/main/java/dao/WidgetScope.java
diff --git a/src/main/java/dao/entities/TokenModel.java → ...rc/main/java/dao/entities/TokenModel.java b/src/main/java/dao/entities/TokenModel.java → ...rc/main/java/dao/entities/TokenModel.java
diff --git a/src/main/java/dao/entities/UserModel.java → ...src/main/java/dao/entities/UserModel.java b/src/main/java/dao/entities/UserModel.java → ...src/main/java/dao/entities/UserModel.java
diff --git a/src/main/java/dao/entities/WidgetModel.java → ...c/main/java/dao/entities/WidgetModel.java b/src/main/java/dao/entities/WidgetModel.java → ...c/main/java/dao/entities/WidgetModel.java
diff --git a/src/main/resources/migrations.xml → common/src/main/resources/migrations.xml b/src/main/resources/migrations.xml → common/src/main/resources/migrations.xml
diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,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>
   <packaging>pom</packaging>
+
   <modules>
     <module>authentication-api</module>
     <module>business-api</module>
+    <module>common</module>
   </modules>
 
   <properties>
@@ -17,6 +19,14 @@
   <artifactId>auth-multitenancy-example</artifactId>
   <version>1.0</version>
 
+  <repositories>
+    <repository>
+      <id>project.local</id>
+      <name>project</name>
+      <url>file:${project.basedir}/</url>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
       <groupId>io.dropwizard</groupId>