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

ao-apps · Aug 17, 2023 · 096bdac · 096bdac
2 parents 0fdece6 + e49481b
commit 096bdac
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/pom.xml b/book/pom.xml
@@ -30,7 +30,7 @@ along with pragmatickm-task.  If not, see <https://www.gnu.org/licenses/>.
   </parent>
 
   <groupId>com.pragmatickm</groupId><artifactId>pragmatickm-task-book</artifactId><version>2.0.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <properties>
     <module.name>com.pragmatickm.task.book</module.name>
@@ -152,6 +152,14 @@ along with pragmatickm-task.  If not, see <https://www.gnu.org/licenses/>.
               </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/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view