Skip to content

Commit 25d1bf0

Browse files
janweinschenkerjanweinschenker
committed
chore: jgitflow plugin
1 parent b8f7b4f commit 25d1bf0

File tree

14 files changed

+25
-32
lines changed

14 files changed

+25
-32
lines changed

‎client-jetty/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
32
<parent>
43
<artifactId>servlet4-demo</artifactId>
54
<groupId>de.holisticon</groupId>
6-
<version>0.0.1-SNAPSHOT</version>
5+
<version>1.0.0</version>
76
</parent>
87
<modelVersion>4.0.0</modelVersion>
98

‎client-jetty/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@SuppressWarnings({"deprecation", "removal"})
22
module de.holisticon.servlet4demo.jettyclient {
33

4-
requires de.holisticon.servlet4demo;
4+
requires de.holisticon.servlet4demo.util;
55

66
requires spring.core;
77
requires spring.beans;

‎client-okhttp/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
32
<parent>
43
<artifactId>servlet4-demo</artifactId>
54
<groupId>de.holisticon</groupId>
6-
<version>0.0.1-SNAPSHOT</version>
5+
<version>1.0.0</version>
76
</parent>
87
<modelVersion>4.0.0</modelVersion>
98

‎client-okhttp/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module de.holisticon.servlet4demo.okhttpclient {
22

3-
requires de.holisticon.servlet4demo;
3+
requires de.holisticon.servlet4demo.util;
44

55
requires spring.core;
66
requires spring.expression;

‎demo-util/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
32
<parent>
43
<artifactId>servlet4-demo</artifactId>
54
<groupId>de.holisticon</groupId>
6-
<version>0.0.1-SNAPSHOT</version>
5+
<version>1.0.0</version>
76
</parent>
87
<modelVersion>4.0.0</modelVersion>
98

‎demo-util/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module de.holisticon.servlet4demo {
1+
module de.holisticon.servlet4demo.util {
22

33
exports de.holisticon.servlet4demo;
44
}

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<flowInitContext>
280280
<masterBranchName>master</masterBranchName>
281281
<developBranchName>development</developBranchName>
282-
<featureBranchPrefix>feature/-</featureBranchPrefix>
282+
<featureBranchPrefix>feature/</featureBranchPrefix>
283283
<releaseBranchPrefix>release-</releaseBranchPrefix>
284284
<hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
285285
<versionTagPrefix>version-</versionTagPrefix>
@@ -288,7 +288,7 @@
288288
<password>PASSWORD_FOR_A_GIT_USER</password>
289289
<noDeploy>true</noDeploy>
290290
<squash>true</squash>
291-
<scmCommentPrefix>[RELEASE] </scmCommentPrefix>
291+
<scmCommentPrefix>[RELEASE]</scmCommentPrefix>
292292
</configuration>
293293
</plugin>
294294
<plugin>

‎server-glassfish/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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">
32
<parent>
43
<artifactId>servlet4-demo</artifactId>
54
<groupId>de.holisticon</groupId>
6-
<version>0.0.1-SNAPSHOT</version>
5+
<version>1.0.0</version>
76
</parent>
87
<modelVersion>4.0.0</modelVersion>
98

‎server-jetty/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
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"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
43
<modelVersion>4.0.0</modelVersion>
54

65
<groupId>de.holisticon</groupId>
76
<artifactId>servlet4-demo-server-jetty</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
7+
<version>1.0.0</version>
98
<packaging>jar</packaging>
109

1110
<name>servlet4-demo-server-jetty</name>
@@ -14,7 +13,7 @@
1413
<parent>
1514
<groupId>de.holisticon</groupId>
1615
<artifactId>servlet4-demo</artifactId>
17-
<version>0.0.1-SNAPSHOT</version>
16+
<version>1.0.0</version>
1817
</parent>
1918

2019
<properties>

‎server-jetty/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module de.holisticon.servlet4demo.serverjetty {
22

3-
requires de.holisticon.servlet4demo;
3+
requires de.holisticon.servlet4demo.util;
44

55
requires spring.core;
66
requires spring.beans;

0 commit comments

Comments
 (0)