From 3cf1fa9a2d954dedede20e1987a0ef64d246acc5 Mon Sep 17 00:00:00 2001 From: jez04 <david.jezek@post.cz> Date: Thu, 24 Oct 2024 15:36:15 +0200 Subject: [PATCH] mavenize project --- .gitignore | 5 ++ .gitlab-ci.yml | 2 - Obesenec/.gitignore | 1 - Obesenec/pom.xml | 83 ------------------ Obesenec/src/cz/vsb/krouzek/Hraj.java | 26 ------ pom.xml | 80 +++++++++++++++++ .../java}/cz/vsb/krouzek/OknoSibenice.java | 0 .../java}/cz/vsb/krouzek/SibeniceZaklad.java | 0 .../src => src/main/java}/module-info.java | 0 .../cz/vsb/krouzek/images/sibenice-0.png | Bin .../cz/vsb/krouzek/images/sibenice-1.png | Bin .../cz/vsb/krouzek/images/sibenice-2.png | Bin .../cz/vsb/krouzek/images/sibenice-3.png | Bin .../cz/vsb/krouzek/images/sibenice-4.png | Bin .../cz/vsb/krouzek/images/sibenice-5.png | Bin .../cz/vsb/krouzek/images/sibenice-6.png | Bin .../cz/vsb/krouzek/images/sibenice-7.png | Bin .../cz/vsb/krouzek/images/sibenice-8.png | Bin 18 files changed, 85 insertions(+), 112 deletions(-) create mode 100644 .gitignore delete mode 100644 Obesenec/.gitignore delete mode 100644 Obesenec/pom.xml delete mode 100644 Obesenec/src/cz/vsb/krouzek/Hraj.java create mode 100644 pom.xml rename {Obesenec/src => src/main/java}/cz/vsb/krouzek/OknoSibenice.java (100%) rename {Obesenec/src => src/main/java}/cz/vsb/krouzek/SibeniceZaklad.java (100%) rename {Obesenec/src => src/main/java}/module-info.java (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-0.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-1.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-2.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-3.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-4.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-5.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-6.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-7.png (100%) rename {Obesenec/src => src/main/resources}/cz/vsb/krouzek/images/sibenice-8.png (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..468255b --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/bin/ +/target/ +/.settings/ +.project +.classpath \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f7ddbe..05ccb08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,6 @@ build-job: # This job runs in the build stage, which runs first. stage: build script: - echo "Compiling the code..." - - whoami - - /home/gitlab-runner/.dotnet/dotnet - mvn compile - echo "Compile complete." diff --git a/Obesenec/.gitignore b/Obesenec/.gitignore deleted file mode 100644 index ae3c172..0000000 --- a/Obesenec/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/Obesenec/pom.xml b/Obesenec/pom.xml deleted file mode 100644 index 3ba9e5d..0000000 --- a/Obesenec/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<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>cz.vsb.fei.kp</groupId> - <artifactId>obesenec</artifactId> - <version>0.0.1-SNAPSHOT</version> - - <name>obesenec</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>5.10.0</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <sourceDirectory>src</sourceDirectory> - <pluginManagement><!-- lock down plugins versions to avoid using Maven - defaults (may be moved to parent pom) --> - <plugins> - <!-- clean lifecycle, see - https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> - </plugin> - <!-- default lifecycle, jar packaging: see - https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>3.1.2</version> - </plugin> - <plugin> - <artifactId>maven-failsafe-plugin</artifactId> - <version>3.1.2</version> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> - </plugin> - <!-- site lifecycle, see - https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>3.7.1</version> - </plugin> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>3.0.0</version> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> diff --git a/Obesenec/src/cz/vsb/krouzek/Hraj.java b/Obesenec/src/cz/vsb/krouzek/Hraj.java deleted file mode 100644 index 973fcd4..0000000 --- a/Obesenec/src/cz/vsb/krouzek/Hraj.java +++ /dev/null @@ -1,26 +0,0 @@ -package cz.vsb.krouzek; - -import java.util.List; - -public class Hraj { - - private static OknoSibenice oknoSibenice; - - public static void main(String[] args) { - oknoSibenice = new OknoSibenice(Hraj::startHry, Hraj::konecHry, Hraj::zvolenoPismeno); - - - } - - public static void startHry() { - - } - - public static void konecHry() { - - } - - public static void zvolenoPismeno(List<Character> pismena) { - } - -} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9973f56 --- /dev/null +++ b/pom.xml @@ -0,0 +1,80 @@ +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>cz.vsb.fei.kp</groupId> + <artifactId>obesenec</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <name>obesenec</name> + + <packaging>jar</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.release>21</maven.compiler.release> + <JUnit.version>5.11.0</JUnit.version> + <log4j.version>2.23.1</log4j.version> + <lombok.version>1.18.34</lombok.version> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + <version>${JUnit.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.13.0</version> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.5.0</version> + </plugin> + </plugins> + </build> + +</project> diff --git a/Obesenec/src/cz/vsb/krouzek/OknoSibenice.java b/src/main/java/cz/vsb/krouzek/OknoSibenice.java similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/OknoSibenice.java rename to src/main/java/cz/vsb/krouzek/OknoSibenice.java diff --git a/Obesenec/src/cz/vsb/krouzek/SibeniceZaklad.java b/src/main/java/cz/vsb/krouzek/SibeniceZaklad.java similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/SibeniceZaklad.java rename to src/main/java/cz/vsb/krouzek/SibeniceZaklad.java diff --git a/Obesenec/src/module-info.java b/src/main/java/module-info.java similarity index 100% rename from Obesenec/src/module-info.java rename to src/main/java/module-info.java diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-0.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-0.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-0.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-0.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-1.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-1.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-1.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-1.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-2.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-2.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-2.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-2.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-3.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-3.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-3.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-3.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-4.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-4.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-4.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-4.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-5.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-5.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-5.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-5.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-6.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-6.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-6.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-6.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-7.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-7.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-7.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-7.png diff --git a/Obesenec/src/cz/vsb/krouzek/images/sibenice-8.png b/src/main/resources/cz/vsb/krouzek/images/sibenice-8.png similarity index 100% rename from Obesenec/src/cz/vsb/krouzek/images/sibenice-8.png rename to src/main/resources/cz/vsb/krouzek/images/sibenice-8.png -- GitLab