SUPPORT-8546 small fixes after merge
This commit is contained in:
parent
f8aef7dba5
commit
d12fb9937a
4 changed files with 12 additions and 40 deletions
|
|
@ -178,6 +178,10 @@
|
|||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>${project.parent.artifactId}</finalName>
|
||||
|
|
|
|||
6
frontend/package-lock.json
generated
6
frontend/package-lock.json
generated
|
|
@ -1624,9 +1624,9 @@
|
|||
}
|
||||
},
|
||||
"@webbpm/base-package": {
|
||||
"version": "3.182.0",
|
||||
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.182.0.tgz",
|
||||
"integrity": "sha512-8pb1hMxjiHrOPCXhWoycSJqb7LT2ldSeWnHJmS8FD53ZRJqErcYj50Nj5Yz2lcoye0OVmhFtSv/YNyRVTQX6yw==",
|
||||
"version": "3.183.1",
|
||||
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.183.1.tgz",
|
||||
"integrity": "sha512-DOLSPRqYNaWai7uxGvOYmBmSCuovkg3qdgkTjzt6Lf+I1VE+SgXeUI+w0CGejLR00fX9fj8QfXORpnd/khuEbQ==",
|
||||
"requires": {
|
||||
"tslib": "^1.9.0"
|
||||
}
|
||||
|
|
|
|||
5
pom.xml
5
pom.xml
|
|
@ -302,6 +302,11 @@
|
|||
<artifactId>log4j-web</artifactId>
|
||||
<version>2.23.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>1.12.759</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<repositories>
|
||||
|
|
|
|||
|
|
@ -47,43 +47,6 @@
|
|||
</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