Merge remote-tracking branch 'origin/1.x'

ao-apps · Aug 17, 2023 · e5d7fed · e5d7fed
2 parents dcbdac3 + fc3bba1
commit e5d7fed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/book/pom.xml b/book/pom.xml
@@ -30,7 +30,7 @@ along with pragmatickm-password-taglib.  If not, see <https://www.gnu.org/licens
   </parent>
 
   <groupId>com.pragmatickm</groupId><artifactId>pragmatickm-password-taglib-book</artifactId><version>2.0.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <properties>
     <module.name>com.pragmatickm.password.taglib.book</module.name>
@@ -197,6 +197,14 @@ along with pragmatickm-password-taglib.  If not, see <https://www.gnu.org/licens
               </instructions>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/module-info.class</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@ along with pragmatickm-password-taglib.  If not, see <https://www.gnu.org/licens
   </parent>
 
   <groupId>com.pragmatickm</groupId><artifactId>pragmatickm-password-taglib</artifactId><version>2.0.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <properties>
     <module.name>com.pragmatickm.password.taglib</module.name>
@@ -381,6 +381,14 @@ along with pragmatickm-password-taglib.  If not, see <https://www.gnu.org/licens
               </instructions>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/module-info.class</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>