From 5fd7ae48923be18c7d4a9e77248fb1d3ee25dd7f Mon Sep 17 00:00:00 2001 From: Jeroen Baten Date: Fri, 15 May 2015 08:57:56 +0200 Subject: [PATCH] fixes to the build system -Pom get extra plugins and a dependency to get through Launchpad build process. -Maintainer in control file edited. -no more build of NavalPlan. --- debian/control | 13 +- pom.xml | 1786 ++++++++++++++++++++++++++---------------------- 2 files changed, 980 insertions(+), 819 deletions(-) diff --git a/debian/control b/debian/control index 2e82f7f81..83b8bb340 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libreplan Section: web Priority: optional -Maintainer: Adrian Perez +Maintainer: Jeroen Baten Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, gettext (>= 0.17), default-jdk Standards-Version: 3.8.4 @@ -22,14 +22,3 @@ Description: Web application for project planning, monitoring and control. the communication with other company tools providing a wide set of web services to import and export data. -Package: navalplan -Architecture: all -Pre-Depends: libreplan (>= 1.2.0-1) -Depends: ${misc:Depends} -Description: Web application for project management (transitional package) - NavalPlan is a planning tool for users based on some concepts: company and - multi-project overview, criteria assignments, tasks tagging, resources - management, resource allocation (specific and generic), company load control, - external integration, etc. - . - This package can be safely deleted after Libreplan is successfully installed. diff --git a/pom.xml b/pom.xml index f5a666682..423965915 100644 --- a/pom.xml +++ b/pom.xml @@ -1,50 +1,44 @@ - - - 4.0.0 - org.libreplan - libreplan - pom - 1.4.0 - LibrePlan - - - - - libreplan-business - ganttzk - libreplan-webapp - - - + + libreplan-business + ganttzk + libreplan-webapp + + - - - - libreplan - libreplan - jdbc/libreplan-ds - ${dataSource.user} - ${dataSource.password} - public. - - true - true - - UTF-8 - - - + libreplan + libreplan + jdbc/libreplan-ds + ${dataSource.user} + ${dataSource.password} + public. + true + true + UTF-8 + + - - - - - - dev - - true - - - - dev - - false - true - true - validate - - + + dev + + true + + + + dev + + false + true + true + validate + - false - - - - - - prod - - - prod - - false - false - false - validate - - - - - - postgresql - - true - - - - org.postgresql - postgresql - 9.2-1003-jdbc4 - org.postgresql.Driver - - jdbc:postgresql://localhost/libreplan${libreplan.mode} - ${dataSource.url}test - - org.hibernate.dialect.PostgreSQLDialect - public. - - - - - - mysql - - - mysql - mysql-connector-java - 5.0.5 - com.mysql.jdbc.Driver - - jdbc:mysql://localhost/libreplan${libreplan.mode} - ${dataSource.url}test - - org.hibernate.dialect.MySQL5InnoDBDialect - - - - - - - + + prod + + + prod + + false + false + false + validate + + + + + postgresql + + true + + + + org.postgresql + postgresql + 9.2-1003-jdbc4 + org.postgresql.Driver + + jdbc:postgresql://localhost/libreplan${libreplan.mode} + ${dataSource.url}test + + org.hibernate.dialect.PostgreSQLDialect + public. + + + + + mysql + + + mysql + mysql-connector-java + 5.0.5 + com.mysql.jdbc.Driver + + jdbc:mysql://localhost/libreplan${libreplan.mode} + ${dataSource.url}test + + org.hibernate.dialect.MySQL5InnoDBDialect + + + + + - - - - - gettext-commons-site - http://gettext-commons.googlecode.com/svn/maven-repository - - - - thirdparty - http://nexus.libreplan.org/content/repositories/thirdparty - - - - - - gettext-commons-site - http://gettext-commons.googlecode.com/svn/maven-repository - - + + gettext-commons-site + http://gettext-commons.googlecode.com/svn/maven-repository + + + + thirdparty + http://nexus.libreplan.org/content/repositories/thirdparty + + + + + gettext-commons-site + http://gettext-commons.googlecode.com/svn/maven-repository + + - - - - - - - - net.sf.jasperreports - jasperreports - 4.7.0 - - - net.sf.jasperreports - jasperreports-fonts - 4.0.0 - - - - com.igalia.java.zk.components - jasperreportcomponent - 1.0 - - - - com.igalia.java.zk.components - jfreechartengine - 1.1 - - - - com.igalia.java.zk.components - customdetailrowcomponent - 1.0.0 - - - - org.xnap.commons - gettext-commons - 0.9.6 - - - + + + + + org.codehaus.plexus + plexus-utils + 3.0.5 + + + + net.sf.jasperreports + jasperreports + 4.7.0 + + + net.sf.jasperreports + jasperreports-fonts + 4.0.0 + + + + com.igalia.java.zk.components + jasperreportcomponent + 1.0 + + + + com.igalia.java.zk.components + jfreechartengine + 1.1 + + + + com.igalia.java.zk.components + customdetailrowcomponent + 1.0.0 + + + + org.xnap.commons + gettext-commons + 0.9.6 + + + + ${jdbcDriver.groupId} + ${jdbcDriver.artifactId} + ${jdbcDriver.version} + test + + + + org.hibernate + hibernate + 3.2.7.ga + + + javax.transaction + jta + + + + + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec + 1.1.1 + + + org.hibernate + hibernate-annotations + 3.3.1.GA + + + org.hibernate + hibernate-validator + 3.0.0.ga + + + - - org.springframework - spring-orm - 4.0.3.RELEASE - - - - org.hibernate - hibernate-core - 4.3.4.Final - - - org.hibernate - hibernate-ehcache - 4.3.4.Final - - - - org.hibernate - hibernate-validator - 4.2.0.Final - - - - org.jadira.usertype - usertype.core - 3.2.0.GA - - - org.hibernate - hibernate-entitymanager - - - - - - - ${jdbcDriver.groupId} - ${jdbcDriver.artifactId} - ${jdbcDriver.version} - test - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - 1.0.1.Final - compile - - - xml-apis - xml-apis - - - - - - org.springframework - spring-web - 4.0.3.RELEASE - - - - org.springframework - spring-context-support - 4.0.3.RELEASE - - - - org.aspectj - aspectjweaver - 1.7.4 - - - - - org.springframework.security - spring-security-web - 3.2.3.RELEASE - - - org.springframework.security - spring-security-config - 3.2.3.RELEASE - - - org.springframework.security - spring-security-acl - 3.2.3.RELEASE - - - - org.springframework.security - spring-security-ldap - 3.2.3.RELEASE - - - - - junit - junit - 4.11 - test - - - - com.jolbox - bonecp - 0.8.0.RELEASE - test - - - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - - - org.easymock - easymock - 2.4 - test - - - - org.easymock - easymockclassextension - 2.4 - test - - - - net.sf.json-lib - json-lib - 2.2.3 - jdk15 - - - commons-collections - commons-collections - 3.2 - - - - net.sf.ezmorph - ezmorph - 1.0.6 - - - - commons-lang - commons-lang - 2.4 - - - - commons-math - commons-math - 1.2 - - - - commons-logging - commons-logging - 1.1.3 - - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - - org.beanshell - bsh - 2.0b4 - runtime - - - - commons-fileupload - commons-fileupload - 1.2.1 - runtime - - - - org.zkoss.zk - zul - 5.0.11 - - - org.zkoss.zk - zkplus - 5.0.11 - - - org.zkoss.zk - zk - 5.0.11 - - - org.jruby - jruby - - - - - - org.jgrapht - jgrapht-jdk1.5 - 0.7.3 - - - - jfree - jfreechart - 1.0.13 - - - jfree - jcommon - 1.0.16 - - - - joda-time - joda-time - 2.3 - - - - org.libreplan - ganttzk - ${project.version} - - - - org.libreplan - libreplan-business - ${project.version} - - - org.dbunit - dbunit - 2.4.6 - - - javax.servlet - servlet-api - 2.5 - jar - provided - - - - javax.ws.rs - jsr311-api - 1.0 - - - - org.apache.cxf - cxf-rt-transports-http - 2.2.3 - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-web - - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - 2.2.3 - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - - - - org.codehaus.jackson - jackson-jaxrs - 1.9.9 - - - org.codehaus.jackson - jackson-xc - 1.9.9 - - - - org.zkoss.zkforge - timeplotz - 1.1_50_1 - - - org.zkoss.zkforge - timelinez - 2.3.1_50 - - - org.zkoss.common - zcommon - - - - - - - org.liquibase - liquibase-core - 2.0.5 - - - org.liquibase - liquibase-maven-plugin - 2.0.5 - - - - br.com.digilabs.jqplot - jqplot4java - 1.2.3-javascript - - - - net.sourceforge - mpxj - 4.3.0 - - - - commons-io - commons-io - 1.4 - - - - org.quartz-scheduler - quartz - 1.8.0 - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - - - - - - - - - - - + + com.jolbox + bonecp + 0.7.1.RELEASE + test + + + + org.easymock + easymock + 2.4 + test + + + org.easymock + easymockclassextension + 2.4 + test + + + + org.springframework + spring + 2.5.6 + + + org.springframework + spring-test + 2.5.6 + test + + + + org.springframework + spring-context-support + 2.5.6 + + + + org.springframework.security + spring-security-core + 2.0.5.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + + + org.springframework.security + spring-security-acl + 2.0.5.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-dao + + + org.springframework + spring-jdbc + + + + + org.springframework.security + spring-security-core-tiger + 2.0.5.RELEASE + + + + org.springframework.ldap + spring-ldap-core + 1.3.1.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + org.springframework + spring-tx + + + + + org.springframework.ldap + spring-ldap-core-tiger + 1.3.1.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + org.springframework + spring-tx + + + + + org.springframework.ldap + spring-ldap-odm + 1.3.1.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + org.springframework + spring-tx + + + + + org.springframework.ldap + spring-ldap-ldif-core + 1.3.1.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + org.springframework + spring-tx + + + + + org.springframework.ldap + spring-ldap-ldif-batch + 1.3.1.RELEASE + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-aop + + + org.springframework + spring-support + + + org.springframework + spring-tx + + + + + org.springframework + spring-aop + 2.5.6 + + + org.springframework + spring-beans + + + + + + org.aspectj + aspectjtools + 1.7.1 + + + + org.aspectj + aspectjrt + 1.7.1 + + + net.sf.json-lib + json-lib + 2.2.3 + jdk15 + + + commons-collections + commons-collections + 3.2 + + + net.sf.ezmorph + ezmorph + 1.0.6 + + + + commons-lang + commons-lang + 2.4 + + + + commons-math + commons-math + 1.2 + + + + commons-logging + commons-logging + 1.0.4 + + + + org.beanshell + bsh + 2.0b4 + runtime + + + + commons-fileupload + commons-fileupload + 1.2.1 + runtime + + + + org.zkoss.zk + zul + 5.0.11 + + + org.zkoss.zk + zkplus + 5.0.11 + + + org.zkoss.zk + zk + 5.0.11 + + + org.jruby + jruby + + + + + + org.jgrapht + jgrapht-jdk1.5 + 0.7.3 + + + + jfree + jfreechart + 1.0.13 + + + jfree + jcommon + 1.0.16 + + + + joda-time + joda-time + 1.6 + + + joda-time + joda-time-hibernate + 1.1 + + + cglib + cglib-full + + + ehcache + ehcache + + + + + + org.libreplan + ganttzk + ${project.version} + + + + org.libreplan + libreplan-business + ${project.version} + + + org.dbunit + dbunit + 2.4.6 + + + log4j + log4j + 1.2.14 + + + org.slf4j + slf4j-simple + 1.5.5 + + + javax.servlet + servlet-api + 2.5 + jar + provided + + + + javax.ws.rs + jsr311-api + 1.0 + + + + org.apache.cxf + cxf-rt-transports-http + 2.2.3 + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-web + + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + 2.2.3 + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + + + + org.codehaus.jackson + jackson-jaxrs + 1.9.9 + + + org.codehaus.jackson + jackson-xc + 1.9.9 + + + + org.zkoss.zkforge + timeplotz + 1.1_50_1 + + + org.zkoss.zkforge + timelinez + 2.3.1_50 + + + org.zkoss.common + zcommon + + + + + net.sf.ehcache + ehcache + 1.6.2 + + + + org.liquibase + liquibase-core + 2.0.5 + + + org.liquibase + liquibase-maven-plugin + 2.0.5 + + + + br.com.digilabs.jqplot + jqplot4java + 1.2.3-javascript + + + + net.sourceforge + mpxj + 4.3.0 + + + + commons-io + commons-io + 1.4 + + + + org.quartz-scheduler + quartz + 1.8.0 + + + + + + + + - - src/main/resources - true - - *spring-config.xml - *hibernate.cfg.xml - - - - - - src/main/resources - - - - - ../src/main/jetty - - jetty-env.xml - - ../jetty - true - - - - - ../libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/ - - - ../libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/ - - - ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/ - - - ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/ - - - ../libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/ - - - ../libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/ - - - ../libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/ - - - ../libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/ - - - ../libreplan-webapp/src/main/jasper/projectStatus_Bundle/ - - - - - - - + + ../src/main/jetty + + jetty-env.xml + + ../jetty + true + + + + ../libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/ + + + ../libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/ + + + ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/ + + + ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/ + + + ../libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/ + + + ../libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/ + + + ../libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/ + + + ../libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/ + + + ../libreplan-webapp/src/main/jasper/projectStatus_Bundle/ + + + + - - src/test/resources - true - - *spring-config-test.xml - *hibernate-test.cfg.xml - **/dbunit*.xml - - - - - - src/test/resources - - - - - - - - - - org.xnap.commons - maven-gettext-plugin - 1.2.0 - - i18n.Messages - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - true - 1.6 - 1.6 - UTF-8 - - - - - - - maven-assembly-plugin - - - src/main/assembly/src.xml - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.2 - - - - src/main/webapp/META-INF - META-INF - true - - context.xml - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - alphabetical - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - target/jetty/jetty-env.xml - manual - 9966 - stop - - - + + + org.xnap.commons + maven-gettext-plugin + 1.2.0 + + i18n.Messages + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + true + 1.6 + 1.6 + UTF-8 + + + + + + maven-assembly-plugin + + + src/main/assembly/src.xml + + + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + + + src/main/webapp/META-INF + META-INF + true + + context.xml + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.10 + + alphabetical + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + target/jetty/jetty-env.xml + manual + 9966 + stop + + + - true - - - - - - - ${jdbcDriver.groupId} - ${jdbcDriver.artifactId} - ${jdbcDriver.version} - - - - com.jolbox - bonecp - 0.7.1.RELEASE - - - - org.slf4j - slf4j-api - 1.5.5 - - - org.slf4j - slf4j-simple - 1.5.5 - - - com.google.guava - guava - 14.0.1 - - - - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0-beta-1 - - ${tomcatUrl} - ${tomcatServer} - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - html - - 512M - - - - - - - org.liquibase - liquibase-maven-plugin - 2.0.5 - - - - - + + + + ${jdbcDriver.groupId} + ${jdbcDriver.artifactId} + ${jdbcDriver.version} + + + + com.jolbox + bonecp + 0.7.1.RELEASE + + + + org.slf4j + slf4j-api + 1.5.5 + + + org.slf4j + slf4j-simple + 1.5.5 + + + com.google.guava + guava + 14.0.1 + + + + + + + org.codehaus.mojo + tomcat-maven-plugin + 1.0-beta-1 + + ${tomcatUrl} + ${tomcatServer} + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4 + + + xml + html + + 512M + + + + + + org.liquibase + liquibase-maven-plugin + 2.0.5 + + + + maven-site-plugin + 2.1 + + + + maven-assembly-plugin + 2.1 + + + + maven-jar-plugin + 2.4 + + + + maven-install-plugin + 2.4 + + +