Merge branch 'master' into develop
# Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml
This commit is contained in:
commit
7c7cb3d219
38 changed files with 980 additions and 328 deletions
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ru.micord.ervu.lkrp</groupId>
|
||||
<artifactId>ul</artifactId>
|
||||
<version>1.9.0-SNAPSHOT</version>
|
||||
<version>1.8.2</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ru.micord.ervu.lkrp.ul</groupId>
|
||||
|
|
@ -47,6 +47,43 @@
|
|||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.alexnederlof</groupId>
|
||||
<artifactId>jasperreports-plugin</artifactId>
|
||||
<version>2.8</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
<artifactId>jasperreports-functions</artifactId>
|
||||
<version>${jasperreports.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>${joda-time.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>process-sources</phase>
|
||||
<goals>
|
||||
<goal>jasper</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<!-- These are the default configurations: -->
|
||||
<compiler>net.sf.jasperreports.engine.design.JRJdtCompiler</compiler>
|
||||
<sourceDirectory>src/main/resources</sourceDirectory>
|
||||
<outputDirectory>src/main/resources</outputDirectory>
|
||||
<outputFileExt>.jasper</outputFileExt>
|
||||
<xmlValidation>true</xmlValidation>
|
||||
<verbose>false</verbose>
|
||||
<numberOfThreads>4</numberOfThreads>
|
||||
<failOnMissingSourceDirectory>true</failOnMissingSourceDirectory>
|
||||
<sourceScanner>org.codehaus.plexus.compiler.util.scan.StaleSourceScanner</sourceScanner>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue