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

ao-apps · Sep 15, 2023 · 07c2a30 · 07c2a30
2 parents 3408c04 + eae2b6b
commit 07c2a30
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/book/pom.xml b/book/pom.xml
@@ -122,9 +122,6 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
             <dependency>org.apache.taglibs:taglibs-standard-spec</dependency>
             <!-- Direct -->
             <dependency>javax.servlet.jsp:javax.servlet.jsp-api</dependency>
-            <!-- Runtime Direct -->
-            <dependency>com.semanticcms:semanticcms-core-pages-jspx</dependency>
-            <dependency>org.apache.taglibs:taglibs-standard-impl</dependency>
           </usedDependencies>
           <ignoredDependencies>
             <!-- No "module-info.java" in some release builds -->
@@ -313,9 +310,9 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
       <dependency>
         <groupId>com.aoapps</groupId><artifactId>ao-style</artifactId><version>2.0.1${POST-SNAPSHOT}</version>
       </dependency>
-      <!-- BOM -->
+      <!-- Imports -->
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1-POST-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -363,5 +360,11 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
       <groupId>org.apache.taglibs</groupId><artifactId>taglibs-standard-impl</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!-- Imports (Reactor build order only) -->
+    <dependency>
+      <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1-POST-SNAPSHOT</version>
+      <type>pom</type>
+      <exclusions><exclusion><artifactId>*</artifactId><groupId>*</groupId></exclusion></exclusions>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -118,11 +118,6 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
             <dependency>com.aoapps:ao-taglib</dependency>
             <dependency>com.semanticcms:semanticcms-core-taglib</dependency>
             <dependency>org.apache.taglibs:taglibs-standard-spec</dependency>
-            <!-- Runtime Direct -->
-            <dependency>com.aoapps:ao-servlet-firewall-webjars</dependency>
-            <dependency>org.webjars.npm:d3</dependency>
-            <dependency>org.webjars.npm:dagre-d3</dependency>
-            <dependency>org.apache.taglibs:taglibs-standard-impl</dependency>
           </usedDependencies>
         </configuration>
       </plugin>
@@ -402,9 +397,9 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
       <dependency>
         <groupId>org.webjars.npm</groupId><artifactId>lodash</artifactId><version>4.17.21</version>
       </dependency>
-      <!-- BOM -->
+      <!-- Imports -->
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1-POST-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -463,5 +458,11 @@ along with semanticcms-pagegraph.  If not, see <https://www.gnu.org/licenses/>.
       <groupId>org.apache.taglibs</groupId><artifactId>taglibs-standard-impl</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!-- Imports (Reactor build order only) -->
+    <dependency>
+      <groupId>com.aoapps</groupId><artifactId>javaee-web-api-bom</artifactId><version>7.0.1-POST-SNAPSHOT</version>
+      <type>pom</type>
+      <exclusions><exclusion><artifactId>*</artifactId><groupId>*</groupId></exclusion></exclusions>
+    </dependency>
   </dependencies>
 </project>