Skip to content

Commit 97c75f9

Browse files
KochTobiKochTobi
authored
Fix maven structure (#3)
Co-authored-by: Tobias Koch <[email protected]>
1 parent 10c3a89 commit 97c75f9

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

‎measurement-provider/pom.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
<version>0.1.0</version>
1010
</parent>
1111

12+
<groupId>life.qbic.data-access</groupId>
1213
<artifactId>measurement-provider</artifactId>
14+
<version>0.1.0</version>
1315
<packaging>jar</packaging>
1416

15-
<properties>
16-
<maven.compiler.source>21</maven.compiler.source>
17-
<maven.compiler.target>21</maven.compiler.target>
18-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
</properties>
20-
2117
<build>
2218
<plugins>
2319
<plugin>
@@ -27,7 +23,7 @@
2723
<configuration>
2824
<archive>
2925
<manifestEntries>
30-
<Automatic-Module-Name>${project.groupId}.data_access.measurement.provider</Automatic-Module-Name>
26+
<Automatic-Module-Name>life.qbic.data_access.measurement.provider</Automatic-Module-Name>
3127
</manifestEntries>
3228
</archive>
3329
</configuration>

‎openbis-connector/pom.xml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,24 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>openbis-connector</artifactId>
7-
<packaging>jar</packaging>
8-
<version>0.1.0</version>
96

107
<parent>
118
<groupId>life.qbic</groupId>
129
<artifactId>data-access-server</artifactId>
1310
<version>0.1.0</version>
1411
</parent>
1512

16-
<properties>
17-
<maven.compiler.source>21</maven.compiler.source>
18-
<maven.compiler.target>21</maven.compiler.target>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
</properties>
13+
<groupId>life.qbic.data-access</groupId>
14+
<artifactId>openbis-connector</artifactId>
15+
<packaging>jar</packaging>
16+
<version>0.1.0</version>
2117

2218
<dependencyManagement>
2319
<dependencies>
2420
<dependency>
2521
<groupId>org.springframework.boot</groupId>
2622
<artifactId>spring-boot-dependencies</artifactId>
27-
<version>3.2.2</version>
23+
<version>${spring.boot.version}</version>
2824
<type>pom</type>
2925
<scope>import</scope>
3026
</dependency>
@@ -68,7 +64,7 @@
6864
<classifier>r1700646105</classifier>
6965
</dependency>
7066
<dependency>
71-
<groupId>life.qbic</groupId>
67+
<groupId>life.qbic.data-access</groupId>
7268
<artifactId>measurement-provider</artifactId>
7369
<version>0.1.0</version>
7470
</dependency>
@@ -88,7 +84,7 @@
8884
<configuration>
8985
<archive>
9086
<manifestEntries>
91-
<Automatic-Module-Name>${project.groupId}.data_access.openbis.connector</Automatic-Module-Name>
87+
<Automatic-Module-Name>life.qbic.data_access.openbis.connector</Automatic-Module-Name>
9288
</manifestEntries>
9389
</archive>
9490
</configuration>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<maven.compiler.source>21</maven.compiler.source>
2222
<maven.compiler.target>21</maven.compiler.target>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<spring.boot.version>3.2.3</spring.boot.version>
2425
</properties>
2526

2627
<repositories>

‎rest-api/pom.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>rest-api</artifactId>
7-
<version>0.1.0</version>
8-
<packaging>jar</packaging>
96

107
<parent>
118
<groupId>life.qbic</groupId>
129
<artifactId>data-access-server</artifactId>
1310
<version>0.1.0</version>
1411
</parent>
1512

16-
<properties>
17-
<maven.compiler.source>21</maven.compiler.source>
18-
<maven.compiler.target>21</maven.compiler.target>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<spring.boot.version>3.2.3</spring.boot.version>
21-
</properties>
13+
<groupId>life.qbic.data-access</groupId>
14+
<artifactId>rest-server</artifactId>
15+
<version>0.1.0</version>
16+
<packaging>jar</packaging>
17+
2218

2319
<dependencyManagement>
2420
<dependencies>
@@ -48,17 +44,17 @@
4844
<version>2.3.0</version>
4945
</dependency>
5046
<dependency>
51-
<groupId>life.qbic</groupId>
47+
<groupId>life.qbic.data-access</groupId>
5248
<artifactId>measurement-provider</artifactId>
5349
<version>0.1.0</version>
5450
</dependency>
5551
<dependency>
56-
<groupId>life.qbic</groupId>
52+
<groupId>life.qbic.data-access</groupId>
5753
<artifactId>openbis-connector</artifactId>
5854
<version>0.1.0</version>
5955
</dependency>
6056
<dependency>
61-
<groupId>life.qbic</groupId>
57+
<groupId>life.qbic.data-access</groupId>
6258
<artifactId>zip</artifactId>
6359
<version>0.1.0</version>
6460
</dependency>
@@ -70,6 +66,16 @@
7066
<groupId>org.springframework.boot</groupId>
7167
<artifactId>spring-boot-maven-plugin</artifactId>
7268
<version>${spring.boot.version}</version>
69+
<configuration>
70+
<mainClass>life.qbic.data_access.rest.DataAccessRestServer</mainClass>
71+
</configuration>
72+
<executions>
73+
<execution>
74+
<goals>
75+
<goal>repackage</goal>
76+
</goals>
77+
</execution>
78+
</executions>
7379
</plugin>
7480
</plugins>
7581
</build>

‎zip/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
99
<version>0.1.0</version>
1010
</parent>
1111

12-
<groupId>life.qbic</groupId>
12+
<groupId>life.qbic.data-access</groupId>
1313
<artifactId>zip</artifactId>
1414
<packaging>jar</packaging>
1515

16-
<properties>
17-
<maven.compiler.source>21</maven.compiler.source>
18-
<maven.compiler.target>21</maven.compiler.target>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
</properties>
21-
2216
<build>
2317
<plugins>
2418
<plugin>
@@ -28,7 +22,7 @@
2822
<configuration>
2923
<archive>
3024
<manifestEntries>
31-
<Automatic-Module-Name>${project.groupId}.data_access.zip</Automatic-Module-Name>
25+
<Automatic-Module-Name>life.qbic.data_access.zip</Automatic-Module-Name>
3226
</manifestEntries>
3327
</archive>
3428
</configuration>

‎zip/src/main/java/life/qbic/data_access/util/zip/manipulation/BufferedZippingFunctions.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,17 @@ private BufferedZippingFunctions() {
2121

2222

2323
public static ZipOutputStream zipInto(OutputStream outputStream) {
24+
return zipInto(outputStream, ZipOutputStream.STORED);
25+
}
26+
27+
/**
28+
* @param outputStream the output stream to zip into
29+
* @param method the method to use
30+
* @return a zip output stream zipping into the output stream using the zipping method
31+
*/
32+
public static ZipOutputStream zipInto(OutputStream outputStream, int method) {
2433
ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
25-
zipOutputStream.setMethod(ZipOutputStream.STORED);
34+
zipOutputStream.setMethod(method);
2635
return zipOutputStream;
2736
}
2837

0 commit comments

Comments
 (0)