From 5bbb03548ba6a305add7b5c6b40b81cf8affd788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz> Date: Mon, 20 Mar 2023 08:31:19 +0100 Subject: [PATCH] Upgrade libraries. maven-compiler-plugin log4j javafx --- bin/.gitignore | 14 ++++ bin/pom.xml | 78 ++++++++++++++++++ .../main/java/koz01/java2/lab05/Point.class | Bin 0 -> 1369 bytes bin/src/main/resources/log4j2.xml | 12 +++ pom.xml | 18 ++-- 5 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 bin/.gitignore create mode 100644 bin/pom.xml create mode 100644 bin/src/main/java/koz01/java2/lab05/Point.class create mode 100644 bin/src/main/resources/log4j2.xml diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..3771e04 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,14 @@ +**/target/ +/target/ +*/target/* +.classpath +.project +.settings + +# Package Files # +*.jar +*.war +*.ear + +*.iml +*.idea \ No newline at end of file diff --git a/bin/pom.xml b/bin/pom.xml new file mode 100644 index 0000000..be4ec99 --- /dev/null +++ b/bin/pom.xml @@ -0,0 +1,78 @@ +<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>koz01.java2</groupId> + <artifactId>lab04</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>jar</packaging> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>15</maven.compiler.source> + <maven.compiler.target>15</maven.compiler.target> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.openjfx</groupId> + <artifactId>javafx-controls</artifactId> + <version>15.0.1</version> + </dependency> + <dependency> + <groupId>org.openjfx</groupId> + <artifactId>javafx-fxml</artifactId> + <version>15.0.1</version> + </dependency> + <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>5.5.2</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>5.5.2</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <version>5.5.2</version> + <scope>test</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok --> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.18</version> + <scope>provided</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.14.0</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.14.0</version> + </dependency> + + + </dependencies> +</project> diff --git a/bin/src/main/java/koz01/java2/lab05/Point.class b/bin/src/main/java/koz01/java2/lab05/Point.class new file mode 100644 index 0000000000000000000000000000000000000000..29fb6adf9bfa40fc4fe100a1f20576ee9324f414 GIT binary patch literal 1369 zcmd5+T~8B16unalZI=p&B7S=zF&1OCK;%V?FM<h45fhL^-=@3Mc3^j=&dfH{KW3r{ zzWa0h0meI14G<f`quI>&z31F}=Fa~3_4O10Vpys`iNRxQl4j1OY98?cZyxK<t7~Dp z-pqJ=b))%COXVt1W-u2lGOoJKz4nnv90PVjZHwBF!PHBsq<h6+vaz+ba>$_kTBo7{ zbq2F%p4-M~Q-vAEe!f>mSe*?-iiytqGUHBag?*#jnaJ%6jA{oxfo|9r=mBC+9gnCn z;Yw+TZGnG5V%%{kElQP2L(yeJI_d}`R6-0LqjOq+D(Ec5ILWxR*pZpABbHRqmOtwA z<d}B_E(a-MPrOddB*ikOT3Gb7Id@499YrTj`owkKj|7dqpusi%7bU9g<o!%0(xEN- z!cg+cI#VQ08yscVSn-JzDis~6L>l96VV$Q6Zj_i*1AQ!zQ!KrU2vKc+s2o2*;e~!i zCS((YwMhA)R^(1Ok=mp($_`pxm_%SE1|svcYw-qBBwZu86DF$d4G2o6VvOYIH1cpk zWEM)|a-#^QVXh8UxXxgq(K@S&eP^WVZu+X3ZBfc^i@Yt&fe(?vd`l-hJLE?C^`FhM z>q*PtN$X1WyGi9qch56&xj;OMdUNGt749%Ny+TR;$MQ0$(zDq1c`|s~xS}*Z_XiA? zF3+7_BZFu^)XE!rHna$ThEU}U>buffy21l`tQMAl!36zeO7u;_RG3x5I6)^>s8Ju$ z?sKx5q%ryi(;w!qeSz8U!FHbdDY5}-H>j_Nc?36MA?)3P#d8QH+8ZI<9)mD52B8dh b;oew;`(qFm#~_s8A+eU=5g?6a!kYLERv&%> literal 0 HcmV?d00001 diff --git a/bin/src/main/resources/log4j2.xml b/bin/src/main/resources/log4j2.xml new file mode 100644 index 0000000..551fe15 --- /dev/null +++ b/bin/src/main/resources/log4j2.xml @@ -0,0 +1,12 @@ +<Configuration> + <Appenders> + <Console name="Console"> + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> + </Console> + </Appenders> + <Loggers> + <Root level="info"> + <AppenderRef ref="Console"></AppenderRef> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pom.xml b/pom.xml index be4ec99..b80c5e7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,19 +4,19 @@ <modelVersion>4.0.0</modelVersion> <groupId>koz01.java2</groupId> <artifactId>lab04</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>15</maven.compiler.source> - <maven.compiler.target>15</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>3.11.0</version> </plugin> </plugins> </build> @@ -24,12 +24,12 @@ <dependency> <groupId>org.openjfx</groupId> <artifactId>javafx-controls</artifactId> - <version>15.0.1</version> + <version>17.0.6</version> </dependency> <dependency> <groupId>org.openjfx</groupId> <artifactId>javafx-fxml</artifactId> - <version>15.0.1</version> + <version>17.0.6</version> </dependency> <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api --> <dependency> @@ -56,21 +56,21 @@ <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.18</version> + <version>1.18.26</version> <scope>provided</scope> </dependency> <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.14.0</version> + <version>2.20.0</version> </dependency> <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.14.0</version> + <version>2.20.0</version> </dependency> -- GitLab