Commit 68ab8779 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Omite generación de logs de Birt

See merge request redmic-project/server/library/reports!2
parents 0b7d5fd3 a71ac9ca

pom.xml

+67 −8
Original line number Diff line number Diff line 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

<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">

	<parent>

		<groupId>es.redmic.lib</groupId>

		<artifactId>libs</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<relativePath />

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic.lib</groupId>

	<artifactId>reports</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>Reports</name>

	<description>Data reports library</description>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>

		

		<!-- REDMIC -->

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		

		<!-- OTHER -->

		<org.eclipse.birt.runtime.version>4.4.2</org.eclipse.birt.runtime.version>

		<batik.pdf.version>1.6.0</batik.pdf.version>

		

		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>



		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>

		<!-- Redmic -->

		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>models</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.models.version}</version>

			<scope>provided</scope>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

			<scope>provided</scope>

		</dependency>
@@ -47,7 +74,19 @@ 
			<scope>runtime</scope>

		</dependency>

	</dependencies>



	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<build>

		<resources>

			<resource>
@@ -91,6 +130,26 @@ 
					</dependency>

				</dependencies>

			</plugin>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

		<pluginManagement>

			<plugins>

src/main/java/es/redmic/reports/ReportUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public class ReportUtil { 


	static {

		try {

			CONFIG.setLogConfig("/tmp/birt.log", Level.FINEST);

			CONFIG.setLogConfig(null, Level.WARNING);

			Platform.startup(CONFIG);

		} catch (BirtException e) {

			throw new IllegalArgumentException(e);