Loading pom.xml +19 −46 Original line number Diff line number Diff line Loading @@ -3,28 +3,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.1.0.RELEASE</version> <groupId>es.redmic</groupId> <artifactId>server-parent</artifactId> <version>0.3.0</version> <relativePath /> </parent> <modelVersion>4.0.0</modelVersion> <groupId>es.redmic</groupId> <artifactId>tasks</artifactId> <packaging>jar</packaging> <version>0.7.0</version> <version>0.7.0-feature-applyLicense</version> <name>Tasks</name> <description>Tasks server</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> <tomcat.version>8.5.28</tomcat.version> <!-- REDMIC --> <redmic.db.version>0.6.0</redmic.db.version> <redmic.reports.version>0.6.0</redmic.reports.version> Loading @@ -40,9 +32,6 @@ <powermock.version>1.7.3</powermock.version> <kafka.version>2.0.0</kafka.version> <elasticsearch.version>5.6.1</elasticsearch.version> <!-- Plugins --> <jacoco.version>0.8.1</jacoco.version> </properties> <dependencies> Loading Loading @@ -122,17 +111,6 @@ <artifactId>micrometer-registry-prometheus</artifactId> </dependency> <!-- Logs --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </dependency> <!-- Test --> <dependency> Loading Loading @@ -186,6 +164,21 @@ </dependency> </dependencies> <repositories> <repository> <id>central</id> <name>libs-release</name> <url>https://artifactory.redmic.net/artifactory/libs-release</url> </repository> <repository> <id>snapshots</id> <name>libs-snapshot</name> <url>https://artifactory.redmic.net/artifactory/libs-snapshot</url> </repository> <repository> <id>osgeo</id> <name>Open Source Geospatial Foundation Repository</name> <url>http://download.osgeo.org/webdav/geotools/</url> </repository> <repository> <id>confluent</id> <name>Confluent</name> Loading @@ -210,26 +203,6 @@ <reuseForks>false</reuseForks> </configuration> </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> </build> </project> src/main/java/es/redmic/tasks/TasksApplication.java +20 −0 Original line number Diff line number Diff line package es.redmic.tasks; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; Loading src/main/java/es/redmic/tasks/common/controller/TaskBaseController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Loading src/main/java/es/redmic/tasks/common/controller/TaskController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.springframework.beans.factory.annotation.Value; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Controller; Loading src/main/java/es/redmic/tasks/common/controller/TaskJobBaseController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.springframework.messaging.handler.annotation.MessageExceptionHandler; import es.redmic.exception.tasks.ingest.IngestBaseException; Loading Loading
pom.xml +19 −46 Original line number Diff line number Diff line Loading @@ -3,28 +3,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.1.0.RELEASE</version> <groupId>es.redmic</groupId> <artifactId>server-parent</artifactId> <version>0.3.0</version> <relativePath /> </parent> <modelVersion>4.0.0</modelVersion> <groupId>es.redmic</groupId> <artifactId>tasks</artifactId> <packaging>jar</packaging> <version>0.7.0</version> <version>0.7.0-feature-applyLicense</version> <name>Tasks</name> <description>Tasks server</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> <tomcat.version>8.5.28</tomcat.version> <!-- REDMIC --> <redmic.db.version>0.6.0</redmic.db.version> <redmic.reports.version>0.6.0</redmic.reports.version> Loading @@ -40,9 +32,6 @@ <powermock.version>1.7.3</powermock.version> <kafka.version>2.0.0</kafka.version> <elasticsearch.version>5.6.1</elasticsearch.version> <!-- Plugins --> <jacoco.version>0.8.1</jacoco.version> </properties> <dependencies> Loading Loading @@ -122,17 +111,6 @@ <artifactId>micrometer-registry-prometheus</artifactId> </dependency> <!-- Logs --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </dependency> <!-- Test --> <dependency> Loading Loading @@ -186,6 +164,21 @@ </dependency> </dependencies> <repositories> <repository> <id>central</id> <name>libs-release</name> <url>https://artifactory.redmic.net/artifactory/libs-release</url> </repository> <repository> <id>snapshots</id> <name>libs-snapshot</name> <url>https://artifactory.redmic.net/artifactory/libs-snapshot</url> </repository> <repository> <id>osgeo</id> <name>Open Source Geospatial Foundation Repository</name> <url>http://download.osgeo.org/webdav/geotools/</url> </repository> <repository> <id>confluent</id> <name>Confluent</name> Loading @@ -210,26 +203,6 @@ <reuseForks>false</reuseForks> </configuration> </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> </build> </project>
src/main/java/es/redmic/tasks/TasksApplication.java +20 −0 Original line number Diff line number Diff line package es.redmic.tasks; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; Loading
src/main/java/es/redmic/tasks/common/controller/TaskBaseController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Loading
src/main/java/es/redmic/tasks/common/controller/TaskController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.springframework.beans.factory.annotation.Value; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Controller; Loading
src/main/java/es/redmic/tasks/common/controller/TaskJobBaseController.java +21 −1 Original line number Diff line number Diff line package es.redmic.tasks.common.controller; /*- * #%L * Tasks * %% * Copyright (C) 2019 REDMIC Project / Server * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * #L% */ import org.springframework.messaging.handler.annotation.MessageExceptionHandler; import es.redmic.exception.tasks.ingest.IngestBaseException; Loading