Bläddra i källkod

Introduced a parent pom, along with a client sibling

James Albright 8 år sedan
förälder
incheckning
edf5d3e575
4 ändrade filer med 48 tillägg och 3 borttagningar
  1. 1 0
      .gitignore
  2. 21 0
      client/pom.xml
  3. 20 0
      pom.xml
  4. 6 3
      server/pom.xml

+ 1 - 0
.gitignore

@@ -1,2 +1,3 @@
 /.idea
 /pwm.iml
+/client/target

+ 21 - 0
client/pom.xml

@@ -0,0 +1,21 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.pwm-project</groupId>
+        <artifactId>pwm-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <prerequisites>
+        <maven>3.2</maven>
+    </prerequisites>
+
+    <artifactId>pwm-client</artifactId>
+    <packaging>jar</packaging>
+
+    <name>PWM Password Self Service: Client</name>
+
+</project>

+ 20 - 0
pom.xml

@@ -0,0 +1,20 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <prerequisites>
+        <maven>3.2</maven>
+    </prerequisites>
+
+    <groupId>org.pwm-project</groupId>
+    <artifactId>pwm-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>PWM Password Self Service</name>
+    
+    <modules>
+        <module>client</module>
+        <module>server</module>
+    </modules>
+</project>

+ 6 - 3
server/pom.xml

@@ -2,16 +2,14 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-app</artifactId>
+        <artifactId>pwm-parent</artifactId>
         <version>1.8.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.pwm-project</groupId>
     <artifactId>pwm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>PWM Password Self Service: Server</name>
@@ -851,6 +849,11 @@
 
         <!-- client webjar dependencies -->
         <!-- changes in client dependencies require updating AppProperty.properties:http.resources.webjarMappings -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>pwm-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>dojo</artifactId>