فهرست منبع

rename pwm-parent maven module to pwm

Jason Rivard 4 سال پیش
والد
کامیت
f66039e628
10فایلهای تغییر یافته به همراه20 افزوده شده و 18 حذف شده
  1. 1 1
      client/pom.xml
  2. 1 1
      data-service/pom.xml
  3. 1 1
      docker/pom.xml
  4. 1 1
      lib-data/pom.xml
  5. 1 1
      lib-util/pom.xml
  6. 2 2
      onejar/pom.xml
  7. 7 6
      pom.xml
  8. 1 1
      rest-test-service/pom.xml
  9. 2 2
      server/pom.xml
  10. 3 2
      webapp/pom.xml

+ 1 - 1
client/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 1 - 1
data-service/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 1 - 1
docker/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 1 - 1
lib-data/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 1 - 1
lib-util/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 2 - 2
onejar/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -88,7 +88,7 @@
         -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>pwm</artifactId>
+            <artifactId>pwm-webapp</artifactId>
             <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>

+ 7 - 6
pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.pwm-project</groupId>
-    <artifactId>pwm-parent</artifactId>
+    <artifactId>pwm</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -109,7 +109,7 @@
                             <property>project.root.basedir</property>
                             <project>
                                 <groupId>org.pwm-project</groupId>
-                                <artifactId>pwm-parent</artifactId>
+                                <artifactId>pwm</artifactId>
                             </project>
                         </configuration>
                     </execution>
@@ -243,6 +243,7 @@
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
                     <release>${maven.compiler.release}</release>
+                    <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
@@ -254,7 +255,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.1</version>
+                        <version>10.2</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -396,7 +397,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>7.0.4</version>
+                <version>7.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -471,7 +472,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.5.0</version>
+            <version>4.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -483,7 +484,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
-            <version>2.33.1</version>
+            <version>2.33.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

+ 1 - 1
rest-test-service/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

+ 2 - 2
server/pom.xml

@@ -2,7 +2,7 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -323,7 +323,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>3.0.6</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.nulab-inc</groupId>

+ 3 - 2
webapp/pom.xml

@@ -2,14 +2,14 @@
 
     <parent>
         <groupId>org.pwm-project</groupId>
-        <artifactId>pwm-parent</artifactId>
+        <artifactId>pwm</artifactId>
         <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>pwm</artifactId>
+    <artifactId>pwm-webapp</artifactId>
     <packaging>war</packaging>
 
     <name>PWM Password Self Service: Server WAR</name>
@@ -64,6 +64,7 @@
     </profiles>
 
     <build>
+        <finalName>pwm-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>