Bläddra i källkod

merge calculator

user 1 år sedan
förälder
incheckning
fdcc8e3a37
29 ändrade filer med 180 tillägg och 108 borttagningar
  1. 13 77
      55/AddCalculator/pom.xml
  2. BIN
      55/AddCalculator/target/addCalculator-1.0.jar
  3. 1 1
      55/AddCalculator/target/maven-archiver/pom.properties
  4. 6 6
      55/AddCalculator/target/surefire-reports/TEST-pl.weeia.AddCalculatorTest.xml
  5. 1 1
      55/AddCalculator/target/surefire-reports/pl.weeia.AddCalculatorTest.txt
  6. BIN
      55/AddCalculator/target/test-classes/pl/weeia/AddCalculatorTest.class
  7. 30 0
      55/MergeCalculator/pom.xml
  8. 19 0
      55/MergeCalculator/src/main/java/pl/weeia/MergeCalculator.java
  9. BIN
      55/MergeCalculator/target/classes/pl/weeia/MergeCalculator.class
  10. 3 0
      55/MergeCalculator/target/maven-archiver/pom.properties
  11. 1 0
      55/MergeCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  12. 1 0
      55/MergeCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  13. BIN
      55/MergeCalculator/target/mergeCalculator-1.0.jar
  14. BIN
      55/MultiplyCalculator/target/classes/pl/weeia/Main.class
  15. 1 0
      55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  16. 2 1
      55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  17. 1 1
      55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  18. BIN
      55/MultiplyCalculator/target/multiplyCalculator-1.0.jar
  19. 8 8
      55/MultiplyCalculator/target/surefire-reports/TEST-pl.weeia.MultiplyCalculatorTest.xml
  20. 1 1
      55/MultiplyCalculator/target/surefire-reports/pl.weeia.MultiplyCalculatorTest.txt
  21. BIN
      55/PowerCalculator/target/classes/pl/weeia/Main.class
  22. 1 0
      55/PowerCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  23. 2 1
      55/PowerCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  24. 1 1
      55/PowerCalculator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  25. BIN
      55/PowerCalculator/target/powerCalculator-1.0.jar
  26. 8 8
      55/PowerCalculator/target/surefire-reports/TEST-pl.weeia.PowerCalculatorTest.xml
  27. 1 1
      55/PowerCalculator/target/surefire-reports/pl.weeia.PowerCalculatorTest.txt
  28. 5 0
      55/polecenie
  29. 74 1
      55/pom.xml

+ 13 - 77
55/AddCalculator/pom.xml

@@ -1,78 +1,14 @@
-<project 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>pl.weeia</groupId>
-<artifactId>add</artifactId>
-<version>1.0</version>
-<packaging>jar</packaging>
-<properties>
-<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<maven.compiler.source>11</maven.compiler.source>
-<maven.compiler.target>11</maven.compiler.target>
-</properties>
-<!-- useful for documentation generation -->
-<name>My sample project</name>
-<description>This is my sample project.</description>
-<url>https://weeia.p.lodz.pl</url>
-<dependencies>
-<dependency>
-<groupId>org.junit.jupiter</groupId>
-<artifactId>junit-jupiter-engine</artifactId>
-<version>5.10.2</version>
-<scope>test</scope>
-</dependency>
-<dependency>
-<groupId>org.mockito</groupId>
-<artifactId>mockito-core</artifactId>
-<version>5.11.0</version>
-<scope>test</scope>
-</dependency>
-</dependencies>
-<build>
-<pluginManagement>
-<!--
- lock down plugins versions to avoid using Maven defaults 
--->
-<plugins>
-<!-- clean lifecycle -->
-<plugin>
-<artifactId>maven-clean-plugin</artifactId>
-<version>3.3.2</version>
-</plugin>
-<!-- default lifecycle -->
-<plugin>
-<artifactId>maven-resources-plugin</artifactId>
-<version>3.3.1</version>
-</plugin>
-<plugin>
-<artifactId>maven-compiler-plugin</artifactId>
-<version>3.12.1</version>
-</plugin>
-<plugin>
-<artifactId>maven-surefire-plugin</artifactId>
-<version>3.2.5</version>
-</plugin>
-<plugin>
-<artifactId>maven-jar-plugin</artifactId>
-<version>3.3.0</version>
-</plugin>
-<plugin>
-<artifactId>maven-install-plugin</artifactId>
-<version>3.1.1</version>
-</plugin>
-<plugin>
-<artifactId>maven-deploy-plugin</artifactId>
-<version>3.1.1</version>
-</plugin>
-<!-- site lifecycle -->
-<plugin>
-<artifactId>maven-site-plugin</artifactId>
-<version>4.0.0-M13</version>
-</plugin>
-<plugin>
-<artifactId>maven-project-info-reports-plugin</artifactId>
-<version>3.5.0</version>
-</plugin>
-</plugins>
-</pluginManagement>
-</build>
+<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>
+    <parent>
+        <groupId>pl.weeia</groupId>
+        <artifactId>app-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <artifactId>addCalculator</artifactId>
+    <name>Add Calculator Project</name>
+    <description>This project will be adding two numbers.</description>
+    <url>https://weeia.p.lodz.pl</url>
 </project>

BIN
55/AddCalculator/target/addCalculator-1.0.jar


+ 1 - 1
55/AddCalculator/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=add
+artifactId=addCalculator
 groupId=pl.weeia
 version=1.0

+ 6 - 6
55/AddCalculator/target/surefire-reports/TEST-pl.weeia.AddCalculatorTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.AddCalculatorTest" time="0.053" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.AddCalculatorTest" time="0.058" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="java.specification.version" value="17"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/test-classes:/home/user/testy/tasks/55/AddCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/home/user/.m2/repository/org/mockito/mockito-core/5.11.0/mockito-core-5.11.0.jar:/home/user/.m2/repository/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar:/home/user/.m2/repository/net/bytebuddy/byte-buddy-agent/1.14.12/byte-buddy-agent-1.14.12.jar:/home/user/.m2/repository/org/objenesis/objenesis/3.3/objenesis-3.3.jar:"/>
+    <property name="java.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/test-classes:/home/user/testy/tasks/55/AddCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="java.vm.vendor" value="Debian"/>
     <property name="sun.arch.data.model" value="64"/>
     <property name="java.vendor.url" value="https://tracker.debian.org/openjdk-17"/>
@@ -12,9 +12,9 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="US"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-17-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/home/user/testy/tasks/55/AddCalculator/target/surefire/surefirebooter-20250125155344453_3.jar /home/user/testy/tasks/55/AddCalculator/target/surefire 2025-01-25T15-53-44_373-jvmRun1 surefire-20250125155344453_1tmp surefire_0-20250125155344453_2tmp"/>
+    <property name="sun.java.command" value="/home/user/testy/tasks/55/AddCalculator/target/surefire/surefirebooter-20250125161019470_3.jar /home/user/testy/tasks/55/AddCalculator/target/surefire 2025-01-25T16-10-19_380-jvmRun1 surefire-20250125161019470_1tmp surefire_0-20250125161019470_2tmp"/>
     <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/test-classes:/home/user/testy/tasks/55/AddCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/home/user/.m2/repository/org/mockito/mockito-core/5.11.0/mockito-core-5.11.0.jar:/home/user/.m2/repository/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar:/home/user/.m2/repository/net/bytebuddy/byte-buddy-agent/1.14.12/byte-buddy-agent-1.14.12.jar:/home/user/.m2/repository/org/objenesis/objenesis/3.3/objenesis-3.3.jar:"/>
+    <property name="surefire.test.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/test-classes:/home/user/testy/tasks/55/AddCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
     <property name="user.home" value="/home/user"/>
     <property name="user.language" value="en"/>
@@ -27,7 +27,7 @@
     <property name="line.separator" value="&#10;"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/surefire/surefirebooter-20250125155344453_3.jar"/>
+    <property name="surefire.real.class.path" value="/home/user/testy/tasks/55/AddCalculator/target/surefire/surefirebooter-20250125161019470_3.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="17.0.13+11-Debian-2deb12u1"/>
     <property name="user.name" value="user"/>
@@ -52,5 +52,5 @@
     <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
     <property name="java.class.version" value="61.0"/>
   </properties>
-  <testcase name="testAddTwoNumbers" classname="pl.weeia.AddCalculatorTest" time="0.029"/>
+  <testcase name="testAddTwoNumbers" classname="pl.weeia.AddCalculatorTest" time="0.03"/>
 </testsuite>

+ 1 - 1
55/AddCalculator/target/surefire-reports/pl.weeia.AddCalculatorTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: pl.weeia.AddCalculatorTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.053 s -- in pl.weeia.AddCalculatorTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.058 s -- in pl.weeia.AddCalculatorTest

BIN
55/AddCalculator/target/test-classes/pl/weeia/AddCalculatorTest.class


+ 30 - 0
55/MergeCalculator/pom.xml

@@ -0,0 +1,30 @@
+<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>
+    <parent>
+        <groupId>pl.weeia</groupId>
+        <artifactId>app-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <artifactId>mergeCalculator</artifactId>
+    <name>Merge Calculator Application</name>
+    <description>This project aggregates add, multiply, and power functionalities from other's projects</description>
+    <dependencies>
+        <dependency>
+            <groupId>pl.weeia</groupId>
+            <artifactId>addCalculator</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>pl.weeia</groupId>
+            <artifactId>multiplyCalculator</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>pl.weeia</groupId>
+            <artifactId>powerCalculator</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

+ 19 - 0
55/MergeCalculator/src/main/java/pl/weeia/MergeCalculator.java

@@ -0,0 +1,19 @@
+package pl.weeia;
+
+//import pl.weeia.AddCalculator;
+//import pl.weeia.MultiplyCalculator;
+//import pl.weeia.PowerCalculator;
+
+public class MergeCalculator {
+    public static void main(String[] args) {
+        System.out.println("hello world");
+        AddCalculator addCalculator = new AddCalculator();
+        MultiplyCalculator multiplyCalculator = new MultiplyCalculator();
+        PowerCalculator powerCalculator = new PowerCalculator();
+
+        // Przykładowe użycie
+        System.out.println("Dodawanie: " + addCalculator.add(5, 3)); // 8
+        System.out.println("Mnożenie: " + multiplyCalculator.multiply(5, 3)); // 15
+        System.out.println("Potęgowanie: " + powerCalculator.power(5, 3)); // 125
+    }
+}

BIN
55/MergeCalculator/target/classes/pl/weeia/MergeCalculator.class


+ 3 - 0
55/MergeCalculator/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=mergeCalculator
+groupId=pl.weeia
+version=1.0

+ 1 - 0
55/MergeCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1 @@
+pl/weeia/MergeCalculator.class

+ 1 - 0
55/MergeCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1 @@
+/home/user/testy/tasks/55/MergeCalculator/src/main/java/pl/weeia/MergeCalculator.java

BIN
55/MergeCalculator/target/mergeCalculator-1.0.jar


BIN
55/MultiplyCalculator/target/classes/pl/weeia/Main.class


+ 1 - 0
55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +1,2 @@
+pl/weeia/Main.class
 pl/weeia/MultiplyCalculator.class

+ 2 - 1
55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1,2 @@
-/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/src/main/java/pl/weeia/MultiplyCalculator.java
+/home/user/testy/tasks/55/MultiplyCalculator/src/main/java/pl/weeia/Main.java
+/home/user/testy/tasks/55/MultiplyCalculator/src/main/java/pl/weeia/MultiplyCalculator.java

+ 1 - 1
55/MultiplyCalculator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/src/test/java/pl/weeia/MultiplyCalculatorTest.java
+/home/user/testy/tasks/55/MultiplyCalculator/src/test/java/pl/weeia/MultiplyCalculatorTest.java

BIN
55/MultiplyCalculator/target/multiplyCalculator-1.0.jar


+ 8 - 8
55/MultiplyCalculator/target/surefire-reports/TEST-pl.weeia.MultiplyCalculatorTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.MultiplyCalculatorTest" time="0.054" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.MultiplyCalculatorTest" time="0.047" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="java.specification.version" value="17"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/test-classes:/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
+    <property name="java.class.path" value="/home/user/testy/tasks/55/MultiplyCalculator/target/test-classes:/home/user/testy/tasks/55/MultiplyCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="java.vm.vendor" value="Debian"/>
     <property name="sun.arch.data.model" value="64"/>
     <property name="java.vendor.url" value="https://tracker.debian.org/openjdk-17"/>
@@ -12,9 +12,9 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="US"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-17-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/surefire/surefirebooter-20250122161650252_6.jar /home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/surefire 2025-01-22T16-16-49_421-jvmRun1 surefire-20250122161650252_4tmp surefire_1-20250122161650252_5tmp"/>
+    <property name="sun.java.command" value="/home/user/testy/tasks/55/MultiplyCalculator/target/surefire/surefirebooter-20250125161020392_6.jar /home/user/testy/tasks/55/MultiplyCalculator/target/surefire 2025-01-25T16-10-19_380-jvmRun1 surefire-20250125161020392_4tmp surefire_1-20250125161020392_5tmp"/>
     <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/test-classes:/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
+    <property name="surefire.test.class.path" value="/home/user/testy/tasks/55/MultiplyCalculator/target/test-classes:/home/user/testy/tasks/55/MultiplyCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
     <property name="user.home" value="/home/user"/>
     <property name="user.language" value="en"/>
@@ -22,12 +22,12 @@
     <property name="java.version.date" value="2024-10-15"/>
     <property name="java.home" value="/usr/lib/jvm/java-17-openjdk-amd64"/>
     <property name="file.separator" value="/"/>
-    <property name="basedir" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator"/>
+    <property name="basedir" value="/home/user/testy/tasks/55/MultiplyCalculator"/>
     <property name="java.vm.compressedOopsMode" value="32-bit"/>
     <property name="line.separator" value="&#10;"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator/target/surefire/surefirebooter-20250122161650252_6.jar"/>
+    <property name="surefire.real.class.path" value="/home/user/testy/tasks/55/MultiplyCalculator/target/surefire/surefirebooter-20250125161020392_6.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="17.0.13+11-Debian-2deb12u1"/>
     <property name="user.name" value="user"/>
@@ -40,7 +40,7 @@
     <property name="java.vendor.url.bug" value="https://bugs.debian.org/openjdk-17"/>
     <property name="java.io.tmpdir" value="/tmp"/>
     <property name="java.version" value="17.0.13"/>
-    <property name="user.dir" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/MultiplyCalculator"/>
+    <property name="user.dir" value="/home/user/testy/tasks/55/MultiplyCalculator"/>
     <property name="os.arch" value="amd64"/>
     <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
     <property name="native.encoding" value="UTF-8"/>
@@ -52,5 +52,5 @@
     <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
     <property name="java.class.version" value="61.0"/>
   </properties>
-  <testcase name="testMultiply" classname="pl.weeia.MultiplyCalculatorTest" time="0.025"/>
+  <testcase name="testMultiply" classname="pl.weeia.MultiplyCalculatorTest" time="0.023"/>
 </testsuite>

+ 1 - 1
55/MultiplyCalculator/target/surefire-reports/pl.weeia.MultiplyCalculatorTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: pl.weeia.MultiplyCalculatorTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.054 s -- in pl.weeia.MultiplyCalculatorTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 s -- in pl.weeia.MultiplyCalculatorTest

BIN
55/PowerCalculator/target/classes/pl/weeia/Main.class


+ 1 - 0
55/PowerCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +1,2 @@
+pl/weeia/Main.class
 pl/weeia/PowerCalculator.class

+ 2 - 1
55/PowerCalculator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1,2 @@
-/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/src/main/java/pl/weeia/PowerCalculator.java
+/home/user/testy/tasks/55/PowerCalculator/src/main/java/pl/weeia/Main.java
+/home/user/testy/tasks/55/PowerCalculator/src/main/java/pl/weeia/PowerCalculator.java

+ 1 - 1
55/PowerCalculator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/src/test/java/pl/weeia/PowerCalculatorTest.java
+/home/user/testy/tasks/55/PowerCalculator/src/test/java/pl/weeia/PowerCalculatorTest.java

BIN
55/PowerCalculator/target/powerCalculator-1.0.jar


+ 8 - 8
55/PowerCalculator/target/surefire-reports/TEST-pl.weeia.PowerCalculatorTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.PowerCalculatorTest" time="0.043" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="pl.weeia.PowerCalculatorTest" time="0.048" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="java.specification.version" value="17"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/test-classes:/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
+    <property name="java.class.path" value="/home/user/testy/tasks/55/PowerCalculator/target/test-classes:/home/user/testy/tasks/55/PowerCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="java.vm.vendor" value="Debian"/>
     <property name="sun.arch.data.model" value="64"/>
     <property name="java.vendor.url" value="https://tracker.debian.org/openjdk-17"/>
@@ -12,9 +12,9 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="US"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-17-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/surefire/surefirebooter-20250122161650736_9.jar /home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/surefire 2025-01-22T16-16-49_421-jvmRun1 surefire-20250122161650736_7tmp surefire_2-20250122161650736_8tmp"/>
+    <property name="sun.java.command" value="/home/user/testy/tasks/55/PowerCalculator/target/surefire/surefirebooter-20250125161020996_9.jar /home/user/testy/tasks/55/PowerCalculator/target/surefire 2025-01-25T16-10-19_380-jvmRun1 surefire-20250125161020996_7tmp surefire_2-20250125161020996_8tmp"/>
     <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/test-classes:/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
+    <property name="surefire.test.class.path" value="/home/user/testy/tasks/55/PowerCalculator/target/test-classes:/home/user/testy/tasks/55/PowerCalculator/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
     <property name="user.home" value="/home/user"/>
     <property name="user.language" value="en"/>
@@ -22,12 +22,12 @@
     <property name="java.version.date" value="2024-10-15"/>
     <property name="java.home" value="/usr/lib/jvm/java-17-openjdk-amd64"/>
     <property name="file.separator" value="/"/>
-    <property name="basedir" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator"/>
+    <property name="basedir" value="/home/user/testy/tasks/55/PowerCalculator"/>
     <property name="java.vm.compressedOopsMode" value="32-bit"/>
     <property name="line.separator" value="&#10;"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator/target/surefire/surefirebooter-20250122161650736_9.jar"/>
+    <property name="surefire.real.class.path" value="/home/user/testy/tasks/55/PowerCalculator/target/surefire/surefirebooter-20250125161020996_9.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="17.0.13+11-Debian-2deb12u1"/>
     <property name="user.name" value="user"/>
@@ -40,7 +40,7 @@
     <property name="java.vendor.url.bug" value="https://bugs.debian.org/openjdk-17"/>
     <property name="java.io.tmpdir" value="/tmp"/>
     <property name="java.version" value="17.0.13"/>
-    <property name="user.dir" value="/home/user/testy/tasks4/Tasks/Zad 5 - Maven - dziedziczenie i agregacja/PowerCalculator"/>
+    <property name="user.dir" value="/home/user/testy/tasks/55/PowerCalculator"/>
     <property name="os.arch" value="amd64"/>
     <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
     <property name="native.encoding" value="UTF-8"/>
@@ -52,5 +52,5 @@
     <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
     <property name="java.class.version" value="61.0"/>
   </properties>
-  <testcase name="testPower" classname="pl.weeia.PowerCalculatorTest" time="0.023"/>
+  <testcase name="testPower" classname="pl.weeia.PowerCalculatorTest" time="0.024"/>
 </testsuite>

+ 1 - 1
55/PowerCalculator/target/surefire-reports/pl.weeia.PowerCalculatorTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: pl.weeia.PowerCalculatorTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.043 s -- in pl.weeia.PowerCalculatorTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.048 s -- in pl.weeia.PowerCalculatorTest

+ 5 - 0
55/polecenie

@@ -0,0 +1,5 @@
+
+
+java -cp MergeCalculator/target/mergeCalculator-1.0.jar:MultiplyCalculator/target/multiplyCalculator-1.0.jar:PowerCalculator/target/powerCalculator-1.0.jar:AddCalculator/target/addCalculator-1.0.jar pl.weeia.MergeCalculator
+
+

+ 74 - 1
55/pom.xml

@@ -1 +1,74 @@
-1
+<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>pl.weeia</groupId>
+    <artifactId>app-parent</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.12.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.2.5</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>4.0.0-M13</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>3.5.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+	
+	   <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.10.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+	
+	<modules>
+		<module>AddCalculator</module>
+		<module>MultiplyCalculator</module>
+		<module>PowerCalculator</module>
+		<module>MergeCalculator</module> <!-- Dodano nowy projekt -->
+	</modules>
+</project>