From 8a5bad7c32383d6400b3894942ab86f3ff54b433 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 14 Feb 2017 18:28:25 +0000
Subject: [PATCH] CCM NG: Dependencies for the Devel Bundle are now collected
 in a separate module which can be used by the bundling modules for the
 various application servers.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4563 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle-devel-wildfly-web/pom.xml    | 30 +++------
 ccm-bundle-devel/pom.xml                | 87 +++++++++++++++++++++++++
 ccm-bundle-devel/src/site/apt/index.apt |  7 ++
 ccm-bundle-devel/src/site/site.xml      | 24 +++++++
 pom.xml                                 |  1 +
 5 files changed, 127 insertions(+), 22 deletions(-)
 create mode 100644 ccm-bundle-devel/pom.xml
 create mode 100644 ccm-bundle-devel/src/site/apt/index.apt
 create mode 100644 ccm-bundle-devel/src/site/site.xml

diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index 5ed944908..f0388540a 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -12,7 +12,9 @@
     
     <parent>
         <groupId>org.libreccm</groupId>
-        <artifactId>libreccm-parent</artifactId>
+        <!--<artifactId>libreccm-parent</artifactId>-->
+        <artifactId>ccm-bundle-devel</artifactId>
+        <relativePath>../ccm-bundle-devel</relativePath>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
     
@@ -24,7 +26,7 @@
     <name>LibreCCM Devel Bundle Web for Wildfly</name>
     <url>http://www.libreccm.org/modules/web/wildfly</url>
     
-    <dependencies>
+    <!--<dependencies>
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-core</artifactId>
@@ -40,10 +42,10 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-        </dependency>
+        </dependency>-->
         
         <!-- CCM modules -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-shortcuts</artifactId>
             <version>${project.parent.version}</version>
@@ -52,11 +54,11 @@
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <!-- CCM Modules end -->
         
         <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
@@ -65,22 +67,6 @@
             <artifactId>log4j-api</artifactId>
         </dependency>
         
-    </dependencies>
-    
-    
-    
-    <!--<dependencies>
-        <dependency>
-            <groupId>org.libreccm</groupId>
-            <artifactId>ccm-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-               
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>-->
     
     <build>
diff --git a/ccm-bundle-devel/pom.xml b/ccm-bundle-devel/pom.xml
new file mode 100644
index 000000000..a7d938add
--- /dev/null
+++ b/ccm-bundle-devel/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                              
+                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.libreccm</groupId>
+        <artifactId>libreccm-parent</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.libreccm</groupId>
+    <artifactId>ccm-bundle-devel</artifactId>
+    <packaging>pom</packaging>
+    
+    <name>LibreCCM Devel Bundle</name>
+    <url>http://www.libreccm.org/bundles/devel</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.libreccm</groupId>
+            <artifactId>ccm-core</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.libreccm</groupId>
+            <artifactId>ccm-theme-foundry</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>Saxon-HE</artifactId>
+        </dependency>
+
+        <!-- CCM modules -->
+        <dependency>
+            <groupId>org.libreccm</groupId>
+            <artifactId>ccm-shortcuts</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.librecms</groupId>
+            <artifactId>ccm-cms</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <!-- CCM Modules end -->
+        
+        <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.9</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>summary</report>
+                            <report>license</report>
+                            <report>scm</report>
+                            <report>dependency-management</report>
+                            <report>plugin-management</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>
diff --git a/ccm-bundle-devel/src/site/apt/index.apt b/ccm-bundle-devel/src/site/apt/index.apt
new file mode 100644
index 000000000..597ac21f4
--- /dev/null
+++ b/ccm-bundle-devel/src/site/apt/index.apt
@@ -0,0 +1,7 @@
+            ---------------------
+                   Overview
+            ---------------------
+
+LibreCCM Devel Bundle
+
+    This module defines the dependencies for the devel bundle.
diff --git a/ccm-bundle-devel/src/site/site.xml b/ccm-bundle-devel/src/site/site.xml
new file mode 100644
index 000000000..73e143bc9
--- /dev/null
+++ b/ccm-bundle-devel/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 
+                             http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+    
+    <body>
+        <menu name="Parent project">
+            <item name="LibreCCM" href="../index.html"/>
+        </menu>
+        
+        <menu name="Overview">
+            <item name="The Core module" href="index.html"/>
+        </menu>
+        
+        <menu ref="reports"/>
+    </body>
+    <!--<skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>1.4</version>
+    </skin>-->
+    
+</project>
diff --git a/pom.xml b/pom.xml
index 785a604cf..04a889119 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
         <module>ccm-cms-types-glossaryitem</module>
         <module>ccm-cms-types-faqitem</module>
         <module>ccm-cms-types-externallink</module>
+        <module>ccm-bundle-devel</module>
         <module>ccm-bundle-devel-wildfly-web</module>
         <module>ccm-bundle-devel-wildfly</module>
     </modules>