Skip to content
This repository was archived by the owner on Dec 28, 2024. It is now read-only.

Commit 2f90d47

Browse files
committed
Merge branch 'labs'
# Conflicts: # pom.xml
2 parents cd2d533 + d0245aa commit 2f90d47

File tree

5 files changed

+47
-4
lines changed

5 files changed

+47
-4
lines changed

pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ru.mirea.practice</groupId>
@@ -34,14 +34,12 @@
3434
<module>students/23K0143</module>
3535
<module>students/23K0365</module>
3636
<module>students/23K0368</module>
37-
<module>students/23K0754</module>
3837
<module>students/24K0458</module>
3938
<module>students/23K0350</module>
4039
<module>students/23K1302</module>
4140
<module>students/23K0346</module>
4241
<module>students/24K0459</module>
4342
<module>students/23K0364</module>
44-
<module>students/23K0155</module>
4543
</modules>
4644

4745
<dependencies>
@@ -179,4 +177,4 @@
179177
</plugin>
180178
</plugins>
181179
</build>
182-
</project>
180+
</project>

students/23K1167/23K1167-p01/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<artifactId>23K1167</artifactId>
7+
<groupId>ru.mirea.practice</groupId>
8+
<version>2024.1</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
<artifactId>23K1167-p01</artifactId>
12+
<description>Массивы</description>
13+
</project>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package ru.mirea.practice.s0000001;
2+
3+
public final class Main {
4+
5+
private Main() {
6+
7+
}
8+
9+
public static void main(String[] args) {
10+
System.out.println("первая практическая работа!");
11+
}
12+
}

students/23K1167/README.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Петя Васечкин
2+
КБВО-01-24

students/23K1167/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<artifactId>algorithms-and-data-structures</artifactId>
7+
<groupId>ru.mirea.practice</groupId>
8+
<version>2024.1</version>
9+
<relativePath>../../pom.xml</relativePath>
10+
</parent>
11+
<artifactId>23K1167</artifactId>
12+
<packaging>pom</packaging>
13+
<description>Практическая работа Фролов Александр</description>
14+
15+
<modules>
16+
<module>23K1167-p01</module>
17+
</modules>
18+
</project>

0 commit comments

Comments
 (0)