Skip to content

Commit 37086d0

Browse files
kausandrkausandr
committed
Updated dependencies.
Cleanup.
1 parent 7170868 commit 37086d0

File tree

13 files changed

+37
-84
lines changed
  • cybench-java-benchmark-archetype/src/main/resources/archetype-resources
  • cybench-java-benchmark-httpServers
  • cybench-java-benchmark-io
  • cybench-java-benchmark-json
  • cybench-java-benchmark-list
  • cybench-java-benchmark-mapping
  • cybench-java-benchmark-matrices
  • cybench-java-benchmark-number
  • cybench-java-benchmark-security-crypto
  • cybench-java-benchmark-security-rsa
  • cybench-java-benchmark-string
  • cybench-java-benchmark-trace
  • pom.xml

13 files changed

+37
-84
lines changed

‎cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
<version>1.0.0</version>
1111
</parent>
1212

13-
<groupId>${groupId}</groupId>
14-
<artifactId>${artifactId}</artifactId>
15-
<version>${version}</version>
16-
13+
<artifactId>${project.artifactId}</artifactId>
14+
<packaging>jar</packaging>
1715

18-
<properties>
19-
<jvm.jar.name>${artifactId}</jvm.jar.name>
20-
</properties>
16+
<version>${version}</version>
17+
<name>${project.artifactId}</name>
2118

2219
<dependencies>
2320
<dependency>
@@ -30,7 +27,7 @@
3027

3128
<build>
3229
<defaultGoal>clean package</defaultGoal>
33-
30+
3431
<resources>
3532
<resource>
3633
<directory>./</directory>
@@ -44,7 +41,7 @@
4441
<targetPath>${project.build.directory}/classes</targetPath>
4542
</resource>
4643
</resources>
47-
44+
4845
<plugins>
4946
<plugin>
5047
<groupId>org.apache.maven.plugins</groupId>
@@ -58,7 +55,7 @@
5855
</goals>
5956
<configuration>
6057
<createDependencyReducedPom>false</createDependencyReducedPom>
61-
<finalName>${jvm.jar.name}</finalName>
58+
<finalName>${project.artifactId}</finalName>
6259
<filters>
6360
<filter>
6461
<artifact>*:*</artifact>

‎cybench-java-benchmark-httpServers/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
<packaging>jar</packaging>
3333

3434
<version>${project.httpServers.version}</version>
35-
<name>cybench-java-benchmark-httpServers</name>
36-
37-
<properties>
38-
<jvm.jar.name>cybench-java-benchmark-httpServers</jvm.jar.name>
39-
</properties>
35+
<name>${project.artifactId}</name>
4036

4137
<dependencies>
4238
<dependency>
@@ -68,13 +64,13 @@
6864
<dependency>
6965
<groupId>org.eclipse.jetty</groupId>
7066
<artifactId>jetty-server</artifactId>
71-
<version>9.4.44.v20210927</version>
67+
<version>9.4.46.v20220331</version>
7268
</dependency>
7369

7470
<dependency>
7571
<groupId>io.netty</groupId>
7672
<artifactId>netty-all</artifactId>
77-
<version>4.1.72.Final</version>
73+
<version>4.1.77.Final</version>
7874
</dependency>
7975
<dependency>
8076
<groupId>com.gitee.l0km</groupId>
@@ -112,7 +108,7 @@
112108
<dependency>
113109
<groupId>io.undertow</groupId>
114110
<artifactId>undertow-core</artifactId>
115-
<version>2.2.16.Final</version>
111+
<version>2.2.17.Final</version>
116112
</dependency>
117113
</dependencies>
118114

@@ -145,7 +141,7 @@
145141
</goals>
146142
<configuration>
147143
<createDependencyReducedPom>false</createDependencyReducedPom>
148-
<finalName>${jvm.jar.name}</finalName>
144+
<finalName>${project.artifactId}</finalName>
149145
<filters>
150146
<filter>
151147
<artifact>*:*</artifact>

‎cybench-java-benchmark-io/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
<packaging>jar</packaging>
3333

3434
<version>${project.io.version}</version>
35-
<name>cybench-java-benchmark-io</name>
36-
37-
<properties>
38-
<jvm.jar.name>cybench-java-benchmark-io</jvm.jar.name>
39-
</properties>
35+
<name>${project.artifactId}</name>
4036

4137
<dependencies>
4238
<dependency>
@@ -75,7 +71,7 @@
7571
</goals>
7672
<configuration>
7773
<createDependencyReducedPom>false</createDependencyReducedPom>
78-
<finalName>${jvm.jar.name}</finalName>
74+
<finalName>${project.artifactId}</finalName>
7975
<filters>
8076
<filter>
8177
<artifact>*:*</artifact>

‎cybench-java-benchmark-json/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
<packaging>jar</packaging>
3333

3434
<version>${project.json.version}</version>
35-
<name>cybench-java-benchmark-json</name>
36-
37-
<properties>
38-
<jvm.jar.name>cybench-java-benchmark-json</jvm.jar.name>
39-
</properties>
35+
<name>${project.artifactId}</name>
4036

4137
<dependencies>
4238
<dependency>
@@ -120,7 +116,7 @@
120116
</goals>
121117
<configuration>
122118
<createDependencyReducedPom>false</createDependencyReducedPom>
123-
<finalName>${jvm.jar.name}</finalName>
119+
<finalName>${project.artifactId}</finalName>
124120
<filters>
125121
<filter>
126122
<artifact>*:*</artifact>

‎cybench-java-benchmark-list/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
<packaging>jar</packaging>
3333

3434
<version>${project.list.version}</version>
35-
<name>cybench-java-benchmark-list</name>
36-
37-
<properties>
38-
<jvm.jar.name>cybench-java-benchmark-list</jvm.jar.name>
39-
</properties>
35+
<name>${project.artifactId}</name>
4036

4137
<dependencies>
4238
<dependency>
@@ -75,7 +71,7 @@
7571
</goals>
7672
<configuration>
7773
<createDependencyReducedPom>false</createDependencyReducedPom>
78-
<finalName>${jvm.jar.name}</finalName>
74+
<finalName>${project.artifactId}</finalName>
7975
<filters>
8076
<filter>
8177
<artifact>*:*</artifact>

‎cybench-java-benchmark-mapping/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
<packaging>jar</packaging>
1515

1616
<version>${project.mapping.version}</version>
17-
<name>cybench-java-benchmark-mapping</name>
18-
19-
<properties>
20-
<jvm.jar.name>cybench-java-benchmark-mapping</jvm.jar.name>
21-
</properties>
17+
<name>${project.artifactId}</name>
2218

2319
<dependencies>
2420
<dependency>
@@ -62,7 +58,7 @@
6258
</goals>
6359
<configuration>
6460
<createDependencyReducedPom>false</createDependencyReducedPom>
65-
<finalName>${jvm.jar.name}</finalName>
61+
<finalName>${project.artifactId}</finalName>
6662
<filters>
6763
<filter>
6864
<artifact>*:*</artifact>

‎cybench-java-benchmark-matrices/pom.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
<packaging>jar</packaging>
1414

1515
<version>${project.matrices.version}</version>
16-
<name>cybench-java-benchmark-matrices</name>
17-
18-
<properties>
19-
<jvm.jar.name>cybench-java-benchmark-matrices</jvm.jar.name>
20-
</properties>
16+
<name>${project.artifactId}</name>
2117

2218
<dependencies>
2319
<dependency>
@@ -60,7 +56,7 @@
6056
<dependency>
6157
<groupId>com.google.guava</groupId>
6258
<artifactId>guava</artifactId>
63-
<version>31.0.1-jre</version>
59+
<version>31.1-jre</version>
6460
<exclusions>
6561
<exclusion>
6662
<artifactId>listenablefuture</artifactId>
@@ -120,7 +116,7 @@
120116
</goals>
121117
<configuration>
122118
<createDependencyReducedPom>false</createDependencyReducedPom>
123-
<finalName>${jvm.jar.name}</finalName>
119+
<finalName>${project.artifactId}</finalName>
124120
<filters>
125121
<filter>
126122
<artifact>*:*</artifact>

‎cybench-java-benchmark-number/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
<packaging>jar</packaging>
3333

3434
<version>${project.number.version}</version>
35-
<name>cybench-java-benchmark-number</name>
36-
37-
<properties>
38-
<jvm.jar.name>cybench-java-benchmark-number</jvm.jar.name>
39-
</properties>
35+
<name>${project.artifactId}</name>
4036

4137
<dependencies>
4238
<dependency>
@@ -75,7 +71,7 @@
7571
</goals>
7672
<configuration>
7773
<createDependencyReducedPom>false</createDependencyReducedPom>
78-
<finalName>${jvm.jar.name}</finalName>
74+
<finalName>${project.artifactId}</finalName>
7975
<filters>
8076
<filter>
8177
<artifact>*:*</artifact>

‎cybench-java-benchmark-security-crypto/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
<packaging>jar</packaging>
1515

1616
<version>${project.security.crypto.version}</version>
17-
<name>cybench-java-benchmark-security-crypto</name>
18-
19-
<properties>
20-
<jvm.jar.name>cybench-java-benchmark-security-crypto</jvm.jar.name>
21-
</properties>
17+
<name>${project.artifactId}</name>
2218

2319
<dependencies>
2420
<dependency>
@@ -63,7 +59,7 @@
6359
</goals>
6460
<configuration>
6561
<createDependencyReducedPom>false</createDependencyReducedPom>
66-
<finalName>${jvm.jar.name}</finalName>
62+
<finalName>${project.artifactId}</finalName>
6763
<artifactSet>
6864
<excludes>
6965
<exclude>org.bouncycastle:*:*:*</exclude>

‎cybench-java-benchmark-security-rsa/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
<packaging>jar</packaging>
1515

1616
<version>${project.security.rsa.version}</version>
17-
<name>cybench-java-benchmark-security-rsa</name>
18-
19-
<properties>
20-
<jvm.jar.name>cybench-java-benchmark-security-rsa</jvm.jar.name>
21-
</properties>
17+
<name>${project.artifactId}</name>
2218

2319
<dependencies>
2420
<dependency>
@@ -63,7 +59,7 @@
6359
</goals>
6460
<configuration>
6561
<createDependencyReducedPom>false</createDependencyReducedPom>
66-
<finalName>${jvm.jar.name}</finalName>
62+
<finalName>${project.artifactId}</finalName>
6763
<artifactSet>
6864
<excludes>
6965
<exclude>org.bouncycastle:*:*:*</exclude>

0 commit comments

Comments
 (0)