svn commit: r1614894 - in /syncope/trunk: ./ deb/ pom.xml

[il...@apache.org]

Author: ilgrosso
Date: Thu Jul 31 13:55:09 2014
New Revision: 1614894

URL: http://svn.apache.org/r1614894
Log:
[SYNCOPE-535] Merge from 1_2_X

Added:
    syncope/trunk/deb/
      - copied from r1614893, syncope/branches/1_2_X/deb/
Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 31 13:55:09 2014
@@ -2,5 +2,3 @@ target
 .subversion
 .settings
 .project
-.svn-prop.tmp.swp
-.pom.xml.swp

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1614683-1614893

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1614894&r1=1614893&r2=1614894&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Jul 31 13:55:09 2014
@@ -367,6 +367,8 @@ under the License.
     <codemirror.version>3.23</codemirror.version>
 
     <izpack.version>5.0.0-rc2</izpack.version>
+    
+    <jdeb.version>1.3</jdeb.version>
  
     <conf.directory>${project.build.directory}/test-classes</conf.directory>
     <bundles.directory>${project.build.directory}/bundles</bundles.directory>
@@ -1129,30 +1131,27 @@ under the License.
           <artifactId>maven-dependency-plugin</artifactId>
           <version>2.8</version>
           <configuration>
+            <outputDirectory>${bundles.directory}</outputDirectory>
             <artifactItems>
               <artifactItem>
                 <groupId>org.connid.bundles.soap</groupId>
                 <artifactId>org.connid.bundles.soap</artifactId>
                 <version>${connid.soap.version}</version>
-                <outputDirectory>${bundles.directory}</outputDirectory>
               </artifactItem>
               <artifactItem>
                 <groupId>org.connid.bundles</groupId>
                 <artifactId>org.connid.bundles.csvdir</artifactId>
                 <version>${connid.csvdir.version}</version>
-                <outputDirectory>${bundles.directory}</outputDirectory>
               </artifactItem>
               <artifactItem>
                 <groupId>org.connid.bundles</groupId>
                 <artifactId>org.connid.bundles.ldap</artifactId>
                 <version>${connid.ldap.version}</version>
-                <outputDirectory>${bundles.directory}</outputDirectory>
               </artifactItem>
               <artifactItem>
                 <groupId>org.connid.bundles</groupId>
                 <artifactId>org.connid.bundles.ad</artifactId>
                 <version>${connid.ad.version}</version>
-                <outputDirectory>${bundles.directory}</outputDirectory>
               </artifactItem>
             </artifactItems>
           </configuration>
@@ -1345,6 +1344,11 @@ under the License.
           <artifactId>izpack-maven-plugin</artifactId>
           <version>${izpack.version}</version>
         </plugin>
+        <plugin>        
+          <groupId>org.vafer</groupId>
+          <artifactId>jdeb</artifactId>
+          <version>${jdeb.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
         
@@ -1417,6 +1421,8 @@ under the License.
             <exclude>.git/**</exclude>
             <exclude>.idea/**</exclude>
             <exclude>**/.*</exclude>
+            <exclude>**/deb/control/conffiles</exclude>
+            <exclude>**/deb/control/control</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -1602,5 +1608,6 @@ under the License.
     <module>console</module>
     <module>standalone</module>
     <module>installer</module>
+    <module>deb</module>
   </modules>
 </project>