Skip to content

spline #900 Switch to AbsaOSS root POM #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wajda merged 1 commit into from
Jun 18, 2021
Merged

spline #900 Switch to AbsaOSS root POM #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ ARG DOCKER_BASE_IMAGE_PREFIX=

FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine-slim

ARG VERSION
ARG PROJECT_BUILD_FINAL_NAME

LABEL \
vendor="ABSA" \
copyright="2021 ABSA Group Limited" \
license="Apache License, version 2.0" \
name="Spline Admin Tool"

COPY target/admin-$VERSION.jar ./admin.jar
COPY target/$PROJECT_BUILD_FINAL_NAME.jar ./admin.jar

ENTRYPOINT ["java", "-jar", "admin.jar"]
CMD ["--help"]
29 changes: 14 additions & 15 deletions admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019 ABSA Group Limited
~
~ 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,
~ Copyright 2019 ABSA Group Limited
~
~ 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.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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">
Expand Down Expand Up @@ -70,7 +70,9 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
Expand All @@ -97,9 +99,6 @@
<artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
</configuration>
</plugin>
</plugins>
Expand Down
10 changes: 7 additions & 3 deletions build/parent-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>za.co.absa.spline</groupId>
<artifactId>package-pom</artifactId>
<version>0.6.1</version>
<groupId>za.co.absa</groupId>
<artifactId>root-pom</artifactId>
<version>1.0.0</version>
</parent>

<groupId>za.co.absa.spline</groupId>
<artifactId>parent-pom</artifactId>
<packaging>pom</packaging>

Expand Down Expand Up @@ -54,6 +55,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.5.0</version>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<args>
Expand Down Expand Up @@ -94,6 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand All @@ -102,6 +105,7 @@
<plugin>
<groupId>com.github.cerveada</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>2.0.1</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
Expand Down
13 changes: 13 additions & 0 deletions kafka-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,19 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
<manifestEntries>
<Build-Time>${maven.build.timestamp}</Build-Time>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
Expand Down
29 changes: 26 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<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">
<modelVersion>4.0.0</modelVersion>

<groupId>za.co.absa.spline</groupId>
<artifactId>spline</artifactId>
<version>1.0.0-SNAPSHOT</version>

Expand All @@ -31,11 +32,33 @@
</scm>

<parent>
<groupId>za.co.absa.spline</groupId>
<artifactId>package-pom</artifactId>
<version>0.6.1</version>
<groupId>za.co.absa</groupId>
<artifactId>root-pom</artifactId>
<version>1.0.0</version>
</parent>

<developers>
<developer>
<id>wajda</id>
<name>Oleksandr Vayda</name>
<roles>
<role>Tech Lead</role>
<role>Full-stack developer</role>
</roles>
<timezone>Europe/Prague</timezone>
<url>https://github.com/wajda</url>
</developer>
<developer>
<id>cerveada</id>
<name>Adam Červenka</name>
<roles>
<role>Back-end developer</role>
</roles>
<timezone>Europe/Prague</timezone>
<url>https://github.com/cerveada</url>
</developer>
</developers>

<modules>
<module>build/parent-pom</module>

Expand Down
5 changes: 5 additions & 0 deletions rest-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>gen-swagger-consumer-json</id>
Expand Down Expand Up @@ -121,7 +122,9 @@
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>prepare-package</phase>
Expand All @@ -144,7 +147,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
Expand Down