From 3d139b55f1a8ff1c8152eaf35fa0cece6e0d32b4 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Fri, 4 Feb 2022 12:21:04 +0200 Subject: [PATCH 01/17] Changing to development SNAPSHOT dependency. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f51106f..eb87b89 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ com.gocypher.cybench.client gocypher-cybench-runner - 1.3.1 + 1.4-SNAPSHOT org.openjdk.jmh From caab439e7e9f1537d8edd6fed68b506fc216a678 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Fri, 4 Feb 2022 12:21:33 +0200 Subject: [PATCH 02/17] Updated dependencies. --- cybench-java-benchmark-matrices/pom.xml | 2 +- pom.xml | 35 ++++++++----------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/cybench-java-benchmark-matrices/pom.xml b/cybench-java-benchmark-matrices/pom.xml index 100cd1e..918e0d4 100644 --- a/cybench-java-benchmark-matrices/pom.xml +++ b/cybench-java-benchmark-matrices/pom.xml @@ -81,7 +81,7 @@ com.github.dpaukov combinatoricslib3 - 3.3.2 + 3.3.3 diff --git a/pom.xml b/pom.xml index eb87b89..7a4166c 100644 --- a/pom.xml +++ b/pom.xml @@ -70,15 +70,13 @@ true src/assembly-string ${project.release.version} - ../cybench-java-benchmark-string/target/cybench-java-benchmark-string.jar - + ../cybench-java-benchmark-string/target/cybench-java-benchmark-string.jar ../deploy/string true src/assembly-json ${project.release.version} - ../cybench-java-benchmark-json/target/cybench-java-benchmark-json.jar - + ../cybench-java-benchmark-json/target/cybench-java-benchmark-json.jar ../deploy/json true @@ -90,61 +88,50 @@ src/assembly-list true ${project.release.version} - ../cybench-java-benchmark-list/target/cybench-java-benchmark-list.jar - + ../cybench-java-benchmark-list/target/cybench-java-benchmark-list.jar ../deploy/list true src/assembly-number ${project.release.version} - ../cybench-java-benchmark-number/target/cybench-java-benchmark-number.jar - + ../cybench-java-benchmark-number/target/cybench-java-benchmark-number.jar ../deploy/number true src/assembly-matrices ${project.release.version} - ../cybench-java-benchmark-matrices/target/cybench-java-benchmark-matrices.jar - + ../cybench-java-benchmark-matrices/target/cybench-java-benchmark-matrices.jar ../deploy/matrices true src/assembly-httpServers ${project.release.version} - - ../cybench-java-benchmark-httpServers/target/cybench-java-benchmark-httpServers.jar - + ../cybench-java-benchmark-httpServers/target/cybench-java-benchmark-httpServers.jar ../deploy/httpServers true src/assembly-security-crypto ${project.release.version} - - ../cybench-java-benchmark-security-crypto/target/cybench-java-benchmark-security-crypto.jar - + ../cybench-java-benchmark-security-crypto/target/cybench-java-benchmark-security-crypto.jar ../deploy/security-crypto 1.69 true src/assembly-security-rsa ${project.release.version} - - ../cybench-java-benchmark-security-rsa/target/cybench-java-benchmark-security-rsa.jar - + ../cybench-java-benchmark-security-rsa/target/cybench-java-benchmark-security-rsa.jar ../deploy/security-rsa true src/assembly-trace ${project.release.version} - ../cybench-java-benchmark-trace/target/cybench-java-benchmark-trace.jar - + ../cybench-java-benchmark-trace/target/cybench-java-benchmark-trace.jar ../deploy/trace - 1.9.1 + 1.10.1 2.14.3 src/assembly-mapping - ../cybench-java-benchmark-mapping/target/cybench-java-benchmark-mapping.jar - + ../cybench-java-benchmark-mapping/target/cybench-java-benchmark-mapping.jar ../deploy/mapping ${project.release.version} true From eea4be6920fa2fb65dddd41aa2d5dfd7e55b994c Mon Sep 17 00:00:00 2001 From: drigos31 <85178707+danielrigos@users.noreply.github.com> Date: Fri, 4 Mar 2022 12:05:58 -0500 Subject: [PATCH 03/17] Add project.properties files --- .../config/project.properties | 7 +++++++ cybench-java-benchmark-io/config/project.properties | 7 +++++++ cybench-java-benchmark-json/config/project.properties | 7 +++++++ cybench-java-benchmark-list/config/project.properties | 7 +++++++ cybench-java-benchmark-mapping/config/project.properties | 7 +++++++ cybench-java-benchmark-matrices/config/project.properties | 7 +++++++ cybench-java-benchmark-number/config/project.properties | 7 +++++++ .../config/project.properties | 7 +++++++ .../config/project.properties | 7 +++++++ cybench-java-benchmark-string/config/project.properties | 7 +++++++ .../config/config/project.properties | 7 +++++++ cybench-java-benchmark-trace/config/project.properties | 7 +++++++ 12 files changed, 84 insertions(+) create mode 100644 cybench-java-benchmark-httpServers/config/project.properties create mode 100644 cybench-java-benchmark-io/config/project.properties create mode 100644 cybench-java-benchmark-json/config/project.properties create mode 100644 cybench-java-benchmark-list/config/project.properties create mode 100644 cybench-java-benchmark-mapping/config/project.properties create mode 100644 cybench-java-benchmark-matrices/config/project.properties create mode 100644 cybench-java-benchmark-number/config/project.properties create mode 100644 cybench-java-benchmark-security-crypto/config/project.properties create mode 100644 cybench-java-benchmark-security-rsa/config/project.properties create mode 100644 cybench-java-benchmark-string/config/project.properties create mode 100644 cybench-java-benchmark-trace/config/config/project.properties create mode 100644 cybench-java-benchmark-trace/config/project.properties diff --git a/cybench-java-benchmark-httpServers/config/project.properties b/cybench-java-benchmark-httpServers/config/project.properties new file mode 100644 index 0000000..672cfb3 --- /dev/null +++ b/cybench-java-benchmark-httpServers/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=httpServers +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-io/config/project.properties b/cybench-java-benchmark-io/config/project.properties new file mode 100644 index 0000000..b1a4eba --- /dev/null +++ b/cybench-java-benchmark-io/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=io +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-json/config/project.properties b/cybench-java-benchmark-json/config/project.properties new file mode 100644 index 0000000..cbcc6b1 --- /dev/null +++ b/cybench-java-benchmark-json/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=json +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-list/config/project.properties b/cybench-java-benchmark-list/config/project.properties new file mode 100644 index 0000000..ca1d1fe --- /dev/null +++ b/cybench-java-benchmark-list/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=list +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-mapping/config/project.properties b/cybench-java-benchmark-mapping/config/project.properties new file mode 100644 index 0000000..d318252 --- /dev/null +++ b/cybench-java-benchmark-mapping/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=mapping +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-matrices/config/project.properties b/cybench-java-benchmark-matrices/config/project.properties new file mode 100644 index 0000000..e015dd3 --- /dev/null +++ b/cybench-java-benchmark-matrices/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=matrices +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-number/config/project.properties b/cybench-java-benchmark-number/config/project.properties new file mode 100644 index 0000000..fc18aed --- /dev/null +++ b/cybench-java-benchmark-number/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=number +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-security-crypto/config/project.properties b/cybench-java-benchmark-security-crypto/config/project.properties new file mode 100644 index 0000000..7a739a8 --- /dev/null +++ b/cybench-java-benchmark-security-crypto/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=security-crypto +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-security-rsa/config/project.properties b/cybench-java-benchmark-security-rsa/config/project.properties new file mode 100644 index 0000000..e630e7b --- /dev/null +++ b/cybench-java-benchmark-security-rsa/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=security-rsa +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-string/config/project.properties b/cybench-java-benchmark-string/config/project.properties new file mode 100644 index 0000000..ab72b4a --- /dev/null +++ b/cybench-java-benchmark-string/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=string +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-trace/config/config/project.properties b/cybench-java-benchmark-trace/config/config/project.properties new file mode 100644 index 0000000..cda2987 --- /dev/null +++ b/cybench-java-benchmark-trace/config/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=trace +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.2 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io diff --git a/cybench-java-benchmark-trace/config/project.properties b/cybench-java-benchmark-trace/config/project.properties new file mode 100644 index 0000000..be9d8b2 --- /dev/null +++ b/cybench-java-benchmark-trace/config/project.properties @@ -0,0 +1,7 @@ +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=trace +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io From 9ca5aa9e77aba29de04d699f344ed9673671e3ca Mon Sep 17 00:00:00 2001 From: drigos31 <85178707+danielrigos@users.noreply.github.com> Date: Fri, 4 Mar 2022 13:05:19 -0500 Subject: [PATCH 04/17] Remove duplicate --- .../config/config/project.properties | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 cybench-java-benchmark-trace/config/config/project.properties diff --git a/cybench-java-benchmark-trace/config/config/project.properties b/cybench-java-benchmark-trace/config/config/project.properties deleted file mode 100644 index cda2987..0000000 --- a/cybench-java-benchmark-trace/config/config/project.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Tue, 22 Feb 2022 08:32:35 -0500 - -PROJECT_ARTIFACT=trace -PROJECT_ROOT=root project 'cybench-java-benchmark' -PROJECT_VERSION=1.0.2 -PROJECT_PARENT=root project 'cybench-java-benchmark' -PROJECT_GROUP=cybench.io From 1bee8295ddf77be4c154faa8af3fd9d7c0d1baaa Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 09:29:24 +0200 Subject: [PATCH 05/17] Updated dependencies. --- cybench-java-benchmark-httpServers/pom.xml | 2 +- cybench-java-benchmark-json/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index b238dd1..e6ca6a5 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -112,7 +112,7 @@ io.undertow undertow-core - 2.2.14.Final + 2.2.16.Final diff --git a/cybench-java-benchmark-json/pom.xml b/cybench-java-benchmark-json/pom.xml index 664cc82..acd57bb 100644 --- a/cybench-java-benchmark-json/pom.xml +++ b/cybench-java-benchmark-json/pom.xml @@ -47,7 +47,7 @@ com.google.code.gson gson - 2.8.9 + 2.9.0 io.fastjson diff --git a/pom.xml b/pom.xml index 7a4166c..e9074f3 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ ${project.release.version} ../cybench-java-benchmark-trace/target/cybench-java-benchmark-trace.jar ../deploy/trace - 1.10.1 + 1.11.0 2.14.3 src/assembly-mapping From 145a0412f2610fca230ef1b6c63f90e8809437a6 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 12:02:45 +0200 Subject: [PATCH 06/17] Made project.properties to be bundled into deliverables. Distribution assemblies and deploy components needs review - it all shall be done through modulesets instead hard-coding. --- README.md | 4 +- cybench-java-benchmark-archetype/pom.xml | 94 +++++++++---------- .../META-INF/maven/archetype-metadata.xml | 3 + .../config/project.properties | 26 +++++ .../deployComponentDir.xml | 10 +- .../deployComponentUnix.xml | 10 +- .../deployComponentWin.xml | 10 +- cybench-java-benchmark-security-rsa/pom.xml | 2 +- cybench-java-benchmarks-distribution/pom.xml | 21 +++-- .../resources/cybench.bat | 2 +- .../resources/cybench.sh | 4 +- .../deployComponentDir.xml | 19 +++- .../deployComponentUnix.xml | 19 +++- .../deployComponentWin.xml | 19 +++- .../src/assembly-io/deployComponentDir.xml | 19 +++- .../src/assembly-io/deployComponentUnix.xml | 19 +++- .../src/assembly-io/deployComponentWin.xml | 19 +++- .../src/assembly-json/deployComponentDir.xml | 19 +++- .../src/assembly-json/deployComponentUnix.xml | 19 +++- .../src/assembly-json/deployComponentWin.xml | 19 +++- .../src/assembly-list/deployComponentDir.xml | 19 +++- .../src/assembly-list/deployComponentUnix.xml | 19 +++- .../src/assembly-list/deployComponentWin.xml | 19 +++- .../assembly-mapping/deployComponentDir.xml | 19 +++- .../assembly-mapping/deployComponentUnix.xml | 19 +++- .../assembly-mapping/deployComponentWin.xml | 19 +++- .../assembly-matrices/deployComponentDir.xml | 19 +++- .../assembly-matrices/deployComponentUnix.xml | 19 +++- .../assembly-matrices/deployComponentWin.xml | 19 +++- .../assembly-number/deployComponentDir.xml | 19 +++- .../assembly-number/deployComponentUnix.xml | 19 +++- .../assembly-number/deployComponentWin.xml | 19 +++- .../deployComponentDir.xml | 18 ++-- .../deployComponentUnix.xml | 20 ++-- .../deployComponentWin.xml | 20 ++-- .../deployComponentDir.xml | 22 +++-- .../deployComponentUnix.xml | 21 +++-- .../deployComponentWin.xml | 22 +++-- .../assembly-string/deployComponentDir.xml | 19 +++- .../assembly-string/deployComponentUnix.xml | 19 +++- .../assembly-string/deployComponentWin.xml | 19 +++- .../src/assembly-trace/deployComponentDir.xml | 19 +++- .../assembly-trace/deployComponentUnix.xml | 19 +++- .../src/assembly-trace/deployComponentWin.xml | 19 +++- pom.xml | 45 +++++---- 45 files changed, 612 insertions(+), 255 deletions(-) create mode 100644 cybench-java-benchmark-archetype/src/main/resources/archetype-resources/config/project.properties diff --git a/README.md b/README.md index 4bdeb5b..90a7b81 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Check out the benchmarks from other users and analyze your results here [here](h - Download the selected benchmark package from the [release page](https://github.com/K2NIO/cybench-java-benchmarks/releases) - Extract the files and run cybench.bat (on Windows) or cybench.sh (on Unix). - Analyze results in your console, reports folder or [app.cybench.io](https://app.cybench.io/cybench/) -- **Otional:** manage your benchmarking run configuration located in `/conf/cybench-launcher.properties` +- **Otional:** manage your benchmarking run configuration located in `/config/cybench-launcher.properties` #### CyBench launcher configuration @@ -39,7 +39,7 @@ Check out the benchmarks from other users and analyze your results here [here](h ### Adding Custom Benchmarks for Execution -Update CyBench Launcher configuration located in `/conf/cybench-launcher.properties`: +Update CyBench Launcher configuration located in `/config/cybench-launcher.properties`: * __required__: add or update property `benchmarks`, set path to jar file which contains your JMH benchmarks, this path will be added to the `CLASSPATH` of the JVM. Values must be semicolon separated! diff --git a/cybench-java-benchmark-archetype/pom.xml b/cybench-java-benchmark-archetype/pom.xml index d0b6df9..0792426 100644 --- a/cybench-java-benchmark-archetype/pom.xml +++ b/cybench-java-benchmark-archetype/pom.xml @@ -1,57 +1,57 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - io.cybench - cybench-java-benchmark-archetype - 1.0.0 - maven-archetype + io.cybench + cybench-java-benchmark-archetype + 1.0.0 + maven-archetype - Archetype - cybench-java-benchmark-archetype + Archetype - cybench-java-benchmark-archetype - - http://www.example.com + + http://www.example.com - - UTF-8 - 1.7 - 1.7 - + + UTF-8 + 1.8 + 1.8 + - - - - org.apache.maven.archetype - archetype-packaging - 3.0.1 - - + + + + org.apache.maven.archetype + archetype-packaging + 3.0.1 + + - - - - maven-clean-plugin - 3.1.0 - - - maven-archetype-plugin - 3.0.1 - - - maven-resources-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - + + + + maven-clean-plugin + 3.1.0 + + + maven-archetype-plugin + 3.0.1 + + + maven-resources-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + diff --git a/cybench-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/cybench-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index d5201cc..fa4626c 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -41,6 +41,9 @@ under the License. + + config/ + src/main/java diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/config/project.properties b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/config/project.properties new file mode 100644 index 0000000..1ca94b5 --- /dev/null +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/config/project.properties @@ -0,0 +1,26 @@ +# +# Copyright (C) 2020-2022, K2N.IO. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# + +#Tue, 22 Feb 2022 08:32:35 -0500 + +PROJECT_ARTIFACT=__shortName__ +PROJECT_ROOT=root project 'cybench-java-benchmark' +PROJECT_VERSION=1.0.6 +PROJECT_PARENT=root project 'cybench-java-benchmark' +PROJECT_GROUP=cybench.io \ No newline at end of file diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml index 338a158..e906ee0 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml @@ -34,7 +34,7 @@ ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + config ${prefix}${shortName}${sufix} @@ -49,5 +49,13 @@ + + ${project.${shortName}.home}/config + + *.properties + + config/ + crlf + diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml index 338a158..8854360 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml @@ -34,7 +34,7 @@ ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + config ${prefix}${shortName}${sufix} @@ -49,5 +49,13 @@ + + ${project.${shortName}.home}/config + + *.properties + + config/ + unix + diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml index 338a158..e906ee0 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml @@ -34,7 +34,7 @@ ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + config ${prefix}${shortName}${sufix} @@ -49,5 +49,13 @@ + + ${project.${shortName}.home}/config + + *.properties + + config/ + crlf + diff --git a/cybench-java-benchmark-security-rsa/pom.xml b/cybench-java-benchmark-security-rsa/pom.xml index 33efe62..a45a5c4 100644 --- a/cybench-java-benchmark-security-rsa/pom.xml +++ b/cybench-java-benchmark-security-rsa/pom.xml @@ -13,7 +13,7 @@ cybench-java-benchmark-security-rsa jar - ${project.security-rsa.version} + ${project.security.rsa.version} cybench-java-benchmark-security-rsa diff --git a/cybench-java-benchmarks-distribution/pom.xml b/cybench-java-benchmarks-distribution/pom.xml index 98bd34d..6cf4511 100644 --- a/cybench-java-benchmarks-distribution/pom.xml +++ b/cybench-java-benchmarks-distribution/pom.xml @@ -124,7 +124,7 @@ - ${release.deploy.dir.security-rsa} + ${release.deploy.dir.security.rsa} ${release.deploy.finalName}-security-rsa-${project.version}/ ${release.deploy.finalName}-security-rsa-${project.version}.* @@ -286,7 +286,8 @@ ${release.deploy.dir.httpServers} ${build.assemblies.attach} - ${release.deploy.finalName}-http-servers-${project.httpServers.version} + ${release.deploy.finalName}-http-servers-${project.httpServers.version} + @@ -305,7 +306,8 @@ ${release.deploy.dir.security.crypto} ${build.assemblies.attach} - ${release.deploy.finalName}-security-${project.security.crypto.version} + ${release.deploy.finalName}-security-${project.security.crypto.version} + @@ -315,16 +317,17 @@ single - ${skip.security-rsa.assembly} + ${skip.security.rsa.assembly} false - ${release.security-rsa}/${release.deploy.zip.assembly} - ${release.security-rsa}/${release.deploy.gz.assembly} - ${release.security-rsa}/${release.deploy.dir.assembly} + ${release.security.rsa}/${release.deploy.zip.assembly} + ${release.security.rsa}/${release.deploy.gz.assembly} + ${release.security.rsa}/${release.deploy.dir.assembly} - ${release.deploy.dir.security-rsa} + ${release.deploy.dir.security.rsa} ${build.assemblies.attach} - ${release.deploy.finalName}-security-rsa-${project.security-rsa.version} + ${release.deploy.finalName}-security-rsa-${project.security.rsa.version} + diff --git a/cybench-java-benchmarks-distribution/resources/cybench.bat b/cybench-java-benchmarks-distribution/resources/cybench.bat index 358ab79..24429fa 100644 --- a/cybench-java-benchmarks-distribution/resources/cybench.bat +++ b/cybench-java-benchmarks-distribution/resources/cybench.bat @@ -31,7 +31,7 @@ set argument2=%2 IF ["%1%"] EQU ["-conf"] set resConfig=T IF ["%1%"] EQU ["-config"] set resConfig=T IF ["%resConfig%"] EQU ["T"] set CONFIGURATION_PATH=%2% - IF ["%resConfig%"] EQU ["F"] set CONFIGURATION_PATH=conf/cybench-launcher.properties + IF ["%resConfig%"] EQU ["F"] set CONFIGURATION_PATH=config/cybench-launcher.properties :detectHelpFlag set resHelp=F diff --git a/cybench-java-benchmarks-distribution/resources/cybench.sh b/cybench-java-benchmarks-distribution/resources/cybench.sh index 77fa955..175b531 100644 --- a/cybench-java-benchmarks-distribution/resources/cybench.sh +++ b/cybench-java-benchmarks-distribution/resources/cybench.sh @@ -30,12 +30,12 @@ detect_configuration_path() if [[ "$1" = "-conf" ]]; then resConfig=T; fi if [[ "$1" = "-config" ]]; then resConfig=T; fi if [[ "$resConfig" = "T" ]]; then CONFIGURATION_PATH=$2; fi - if [[ "$resConfig" = "F" ]]; then CONFIGURATION_PATH=conf/cybench-launcher.properties; fi + if [[ "$resConfig" = "F" ]]; then CONFIGURATION_PATH=config/cybench-launcher.properties; fi } set_configuration_properties() { if [[ "$CONFIGURATION_PATH" = "" ]]; then - CONFIGURATION_PATH="conf/cybench-launcher.properties" + CONFIGURATION_PATH="config/cybench-launcher.properties" fi # Read properties file to set JVM properties for .jar run JVM_PROPERTIES="" diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml index 0cecc6f..150c9d8 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.httpServers.jar} @@ -47,5 +48,13 @@ + + ${project.httpServers.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml index 0cecc6f..5f2dabe 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.httpServers.jar} @@ -47,5 +48,13 @@ + + ${project.httpServers.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml index 0cecc6f..150c9d8 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.httpServers.jar} @@ -47,5 +48,13 @@ + + ${project.httpServers.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml index 443af86..d2b676c 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.io.jar} @@ -47,5 +48,13 @@ + + ${project.io.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml index 443af86..7e63e4f 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.io.jar} @@ -47,5 +48,13 @@ + + ${project.io.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml index 443af86..d2b676c 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.io.jar} @@ -47,5 +48,13 @@ + + ${project.io.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml index 06423df..9d50cdf 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.json.jar} @@ -47,5 +48,13 @@ + + ${project.json.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml index 06423df..b65b06c 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.json.jar} @@ -47,5 +48,13 @@ + + ${project.json.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml index 06423df..9d50cdf 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.json.jar} @@ -47,5 +48,13 @@ + + ${project.json.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml index 693ffb8..6af9bf8 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.list.jar} @@ -47,5 +48,13 @@ + + ${project.list.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml index 693ffb8..22227c2 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.list.jar} @@ -47,5 +48,13 @@ + + ${project.list.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml index 693ffb8..6af9bf8 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.list.jar} @@ -47,5 +48,13 @@ + + ${project.list.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml index c0bac96..b939e27 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.mapping.jar} @@ -47,5 +48,13 @@ + + ${project.mapping.home}/config + + *.properties + + config/ + crlf + diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml index c0bac96..cc01734 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.mapping.jar} @@ -47,5 +48,13 @@ + + ${project.mapping.home}/config + + *.properties + + config/ + unix + diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml index c0bac96..b939e27 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.mapping.jar} @@ -47,5 +48,13 @@ + + ${project.mapping.home}/config + + *.properties + + config/ + crlf + diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml index 1e85b61..e35302f 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.matrices.jar} @@ -47,5 +48,13 @@ + + ${project.matrices.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml index 1e85b61..25c2a91 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.matrices.jar} @@ -47,5 +48,13 @@ + + ${project.matrices.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml index 1e85b61..e35302f 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.matrices.jar} @@ -47,5 +48,13 @@ + + ${project.matrices.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml index d77aa71..91ce002 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.number.jar} @@ -47,5 +48,13 @@ + + ${project.number.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml index d77aa71..1f30f01 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.number.jar} @@ -47,5 +48,13 @@ + + ${project.number.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml index d77aa71..91ce002 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.number.jar} @@ -47,5 +48,13 @@ + + ${project.number.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml index c904467..cb4bf27 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml @@ -23,17 +23,17 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd"> - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.security.crypto.jar} @@ -48,11 +48,17 @@ + + ${project.security.crypto.home}/config + + *.properties + + config/ + crlf + - - true true diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml index 8591e49..98843f4 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.security.crypto.jar} @@ -47,10 +48,17 @@ + + ${project.security.crypto.home}/config + + *.properties + + config/ + unix + - true true diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml index 8591e49..cb4bf27 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.security.crypto.jar} @@ -47,10 +48,17 @@ + + ${project.security.crypto.home}/config + + *.properties + + config/ + crlf + - true true diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml index fd7a574..d09277e 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml @@ -18,24 +18,25 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config - ${target.deploy.security-rsa.jar} + ${target.deploy.security.rsa.jar} benchmarks/ @@ -47,11 +48,18 @@ + + ${project.security.rsa.home}/config + + *.properties + + config/ + crlf + - true true diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml index fd7a574..3c85049 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml @@ -18,24 +18,25 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config - ${target.deploy.security-rsa.jar} + ${target.deploy.security.rsa.jar} benchmarks/ @@ -47,6 +48,14 @@ + + ${project.security.rsa.home}/config + + *.properties + + config/ + unix + diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml index fd7a574..d09277e 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml @@ -18,24 +18,25 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config - ${target.deploy.security-rsa.jar} + ${target.deploy.security.rsa.jar} benchmarks/ @@ -47,11 +48,18 @@ + + ${project.security.rsa.home}/config + + *.properties + + config/ + crlf + - true true diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml index 0878996..6c5f926 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.string.jar} @@ -47,5 +48,13 @@ + + ${project.string.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml index 0878996..e98eb10 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.string.jar} @@ -47,5 +48,13 @@ + + ${project.string.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml index 0878996..6c5f926 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.string.jar} @@ -47,5 +48,13 @@ + + ${project.string.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml index 5a528b2..eef0325 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.trace.jar} @@ -47,5 +48,13 @@ + + ${project.trace.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml index 5a528b2..2b5fcfa 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.trace.jar} @@ -47,5 +48,13 @@ + + ${project.trace.home}/config + + *.properties + + config/ + unix + \ No newline at end of file diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml index 5a528b2..eef0325 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml @@ -18,21 +18,22 @@ ~ --> - - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties - conf + resources/cybench-launcher.properties + config ${target.deploy.trace.jar} @@ -47,5 +48,13 @@ + + ${project.trace.home}/config + + *.properties + + config/ + crlf + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7a4166c..79504f6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,68 +70,79 @@ true src/assembly-string ${project.release.version} - ../cybench-java-benchmark-string/target/cybench-java-benchmark-string.jar + ../cybench-java-benchmark-string + ${project.string.home}/target/cybench-java-benchmark-string.jar ../deploy/string true src/assembly-json ${project.release.version} - ../cybench-java-benchmark-json/target/cybench-java-benchmark-json.jar + ../cybench-java-benchmark-json + ${project.json.home}/target/cybench-java-benchmark-json.jar ../deploy/json true src/assembly-io ${project.release.version} - ../cybench-java-benchmark-io/target/cybench-java-benchmark-io.jar + ../cybench-java-benchmark-io + ${project.io.home}/target/cybench-java-benchmark-io.jar ../deploy/io src/assembly-list true ${project.release.version} - ../cybench-java-benchmark-list/target/cybench-java-benchmark-list.jar + ../cybench-java-benchmark-list + ${project.list.home}/target/cybench-java-benchmark-list.jar ../deploy/list true src/assembly-number ${project.release.version} - ../cybench-java-benchmark-number/target/cybench-java-benchmark-number.jar + ../cybench-java-benchmark-number + ${project.number.home}/target/cybench-java-benchmark-number.jar ../deploy/number true src/assembly-matrices ${project.release.version} - ../cybench-java-benchmark-matrices/target/cybench-java-benchmark-matrices.jar + ../cybench-java-benchmark-matrices + ${project.matrices.home}/target/cybench-java-benchmark-matrices.jar ../deploy/matrices true src/assembly-httpServers ${project.release.version} - ../cybench-java-benchmark-httpServers/target/cybench-java-benchmark-httpServers.jar + ../cybench-java-benchmark-httpServers + ${project.httpServers.home}/target/cybench-java-benchmark-httpServers.jar ../deploy/httpServers true src/assembly-security-crypto ${project.release.version} - ../cybench-java-benchmark-security-crypto/target/cybench-java-benchmark-security-crypto.jar + ../cybench-java-benchmark-security-crypto + ${project.security.crypto.home}/target/cybench-java-benchmark-security-crypto.jar ../deploy/security-crypto 1.69 - true - src/assembly-security-rsa - ${project.release.version} - ../cybench-java-benchmark-security-rsa/target/cybench-java-benchmark-security-rsa.jar - ../deploy/security-rsa + true + src/assembly-security-rsa + ${project.release.version} + ../cybench-java-benchmark-security-rsa + ${project.security.rsa.home}/target/cybench-java-benchmark-security-rsa.jar + ../deploy/security-rsa true src/assembly-trace ${project.release.version} - ../cybench-java-benchmark-trace/target/cybench-java-benchmark-trace.jar + ../cybench-java-benchmark-trace + ${project.trace.home}/target/cybench-java-benchmark-trace.jar ../deploy/trace 1.10.1 2.14.3 src/assembly-mapping - ../cybench-java-benchmark-mapping/target/cybench-java-benchmark-mapping.jar + ../cybench-java-benchmark-mapping + ${project.mapping.home}/target/cybench-java-benchmark-mapping.jar ../deploy/mapping ${project.release.version} true @@ -215,7 +226,7 @@ pack-jvm-security-rsa - false + false cybench-java-benchmark-security-rsa @@ -250,7 +261,7 @@ false false false - false + false false false From 2ee1633085743ca3270f0d9a7a1f4ae91584c012 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 12:04:17 +0200 Subject: [PATCH 07/17] Made project.properties to be bundled into deliverables. Distribution assemblies and deploy components needs review - it all shall be done through modulesets instead hard-coding. --- .../archetype-resources/src/pomUpdates/rootProperties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/pomUpdates/rootProperties b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/pomUpdates/rootProperties index 5b227f0..fbc619a 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/pomUpdates/rootProperties +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/pomUpdates/rootProperties @@ -1,5 +1,6 @@ src/assembly-${shortName} - ../cybench-java-benchmark-${shortName}/target/cybench-java-benchmark-${shortName}.jar + ../cybench-java-benchmark-${shortName} + ${project.${shortName}.home}/target/cybench-java-benchmark-${shortName}.jar ../deploy/${shortName} 1.0.0 From 4f137b6bc30a4e5bbe3e28922fcb9a8ce42bdf61 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 12:25:13 +0200 Subject: [PATCH 08/17] Cleanup. --- .../assembly-__shortName__/deployComponentDir.xml | 6 +++--- .../assembly-__shortName__/deployComponentUnix.xml | 6 +++--- .../assembly-__shortName__/deployComponentWin.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml index e906ee0..bc53a5c 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml @@ -24,16 +24,16 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd"> - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties + resources/cybench-launcher.properties config diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml index 8854360..6ec471a 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentUnix.xml @@ -24,16 +24,16 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd"> - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties + resources/cybench-launcher.properties config diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml index e906ee0..bc53a5c 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentWin.xml @@ -24,16 +24,16 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd"> - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.bat + resources/cybench.bat crlf - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench.sh + resources/cybench.sh unix 0777 - ${project.basedir}/../cybench-java-benchmarks-distribution/resources/cybench-launcher.properties + resources/cybench-launcher.properties config From e232e22bf78cc6430eeaabade37edb0d0af78851 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 12:26:07 +0200 Subject: [PATCH 09/17] Made maven executable configurable. --- generate-new.bat | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/generate-new.bat b/generate-new.bat index aecb5eb..8bf5a35 100644 --- a/generate-new.bat +++ b/generate-new.bat @@ -5,14 +5,17 @@ set LF=^ rem TWO empty lines are required +set MVN_EXEC=mvn +set /P MVN_EXEC= Enter Maven executable path: [%MVN_EXEC%] : + cd cybench-java-benchmark-archetype -call mvn install +call %MVN_EXEC% install cd .. echo "Enter the name. The ^"atifactId^" becomes cybench-java-benchmark-[name]" -set /P PROJECT_NAME=Benchmark module name: +set /P PROJECT_NAME= Benchmark module name: -call mvn archetype:generate -DarchetypeGroupId=io.cybench -DarchetypeArtifactId=cybench-java-benchmark-archetype -DarchetypeVersion=1.0.0 -DartifactId=cybench-java-benchmark-%PROJECT_NAME% -DgroupId=io.cybench.client -Dversion=1.0.0 -DshortName=%PROJECT_NAME% +call %MVN_EXEC% archetype:generate -DarchetypeGroupId=io.cybench -DarchetypeArtifactId=cybench-java-benchmark-archetype -DarchetypeVersion=1.0.0 -DartifactId=cybench-java-benchmark-%PROJECT_NAME% -DgroupId=io.cybench.client -Dversion=1.0.0 -DshortName=%PROJECT_NAME% copy pom.xml pom.tmp if exist pom.updated del pom.updated From 5fee0d260b3982f69f0f4bd6a7d4bdabe809b55c Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 7 Mar 2022 12:49:08 +0200 Subject: [PATCH 10/17] Fixed dynamic property. --- cybench-java-benchmark-archetype/pom.xml | 2 +- .../assembly-__shortName__/deployComponentDir.xml | 10 ++++++---- .../assembly-__shortName__/deployComponentUnix.xml | 10 ++++++---- .../assembly-__shortName__/deployComponentWin.xml | 10 ++++++---- .../archetype-resources/src/pomUpdates/rootProperties | 4 +++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/cybench-java-benchmark-archetype/pom.xml b/cybench-java-benchmark-archetype/pom.xml index 0792426..3c797a8 100644 --- a/cybench-java-benchmark-archetype/pom.xml +++ b/cybench-java-benchmark-archetype/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.cybench + io.cybench.client cybench-java-benchmark-archetype 1.0.0 maven-archetype diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml index bc53a5c..1cccae0 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/src/distribution/assembly-__shortName__/deployComponentDir.xml @@ -1,5 +1,7 @@ -#set($prefix = '${target.deploy.') -#set($sufix = '.jar}') +#set($prefixJar = '${target.deploy.') +#set($sufixJar = '.jar}') +#set($prefixHome = '${project.') +#set($sufixHome = '.home}') - + xsi:schemaLocation="http://logging.apache.org/log4j/2.0/config"> logs/cybench.log @@ -41,8 +38,8 @@ filePattern="${log4j.logs.file.name}.%d{yyyyMMdd_HHmmss_SSS}.gz" ignoreExceptions="false" append="true"> - - + + @@ -61,5 +58,6 @@ + diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml index 150c9d8..c91eaff 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.httpServers.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml index 5f2dabe..f658320 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.httpServers.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml index 150c9d8..c91eaff 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-httpServers/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.httpServers.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml index d2b676c..abfb9f3 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.io.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml index 7e63e4f..9a36d72 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.io.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml index d2b676c..abfb9f3 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-io/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.io.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml index 9d50cdf..e57db4a 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.json.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml index b65b06c..bb99604 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.json.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml index 9d50cdf..e57db4a 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-json/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.json.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml index 6af9bf8..e656a8b 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.list.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml index 22227c2..ab7e1a3 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.list.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml index 6af9bf8..e656a8b 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-list/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.list.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml index b939e27..f7d7f96 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.mapping.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml index cc01734..175440a 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.mapping.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml index b939e27..f7d7f96 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-mapping/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.mapping.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml index e35302f..f5bbc13 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.matrices.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml index 25c2a91..636a7d7 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.matrices.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml index e35302f..f5bbc13 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-matrices/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.matrices.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml index 91ce002..4d1d186 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.number.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml index 1f30f01..ebb97f7 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.number.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml index 91ce002..4d1d186 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-number/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.number.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml index cb4bf27..48aeb80 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.crypto.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml index 98843f4..47086d4 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.crypto.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml index cb4bf27..48aeb80 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-crypto/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.crypto.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml index d09277e..19385b5 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.rsa.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml index 3c85049..8d317c9 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.rsa.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml index d09277e..19385b5 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-security-rsa/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.security.rsa.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml index 6c5f926..9ad82d2 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.string.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml index e98eb10..4b5664d 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.string.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml index 6c5f926..9ad82d2 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-string/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.string.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml index eef0325..08e4f98 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentDir.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.trace.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml index 2b5fcfa..d28bfd0 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentUnix.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.trace.jar} benchmarks/ diff --git a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml index eef0325..08e4f98 100644 --- a/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml +++ b/cybench-java-benchmarks-distribution/src/assembly-trace/deployComponentWin.xml @@ -35,6 +35,10 @@ resources/cybench-launcher.properties config + + resources/log4j2.xml + config + ${target.deploy.trace.jar} benchmarks/ From 37086d0ba816870fbbbf4f58b0eafb57af5cf0c0 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Tue, 17 May 2022 11:01:50 +0300 Subject: [PATCH 12/17] Updated dependencies. Cleanup. --- .../main/resources/archetype-resources/pom.xml | 17 +++++++---------- cybench-java-benchmark-httpServers/pom.xml | 14 +++++--------- cybench-java-benchmark-io/pom.xml | 8 ++------ cybench-java-benchmark-json/pom.xml | 8 ++------ cybench-java-benchmark-list/pom.xml | 8 ++------ cybench-java-benchmark-mapping/pom.xml | 8 ++------ cybench-java-benchmark-matrices/pom.xml | 10 +++------- cybench-java-benchmark-number/pom.xml | 8 ++------ cybench-java-benchmark-security-crypto/pom.xml | 8 ++------ cybench-java-benchmark-security-rsa/pom.xml | 8 ++------ cybench-java-benchmark-string/pom.xml | 8 ++------ cybench-java-benchmark-trace/pom.xml | 8 ++------ pom.xml | 8 ++++---- 13 files changed, 37 insertions(+), 84 deletions(-) diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index 5e41cc0..16dd10d 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -10,14 +10,11 @@ 1.0.0 - ${groupId} - ${artifactId} - ${version} - + ${project.artifactId} + jar - - ${artifactId} - + ${version} + ${project.artifactId} @@ -30,7 +27,7 @@ clean package - + ./ @@ -44,7 +41,7 @@ ${project.build.directory}/classes - + org.apache.maven.plugins @@ -58,7 +55,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index e6ca6a5..bcff5e0 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -32,11 +32,7 @@ jar ${project.httpServers.version} - cybench-java-benchmark-httpServers - - - cybench-java-benchmark-httpServers - + ${project.artifactId} @@ -68,13 +64,13 @@ org.eclipse.jetty jetty-server - 9.4.44.v20210927 + 9.4.46.v20220331 io.netty netty-all - 4.1.72.Final + 4.1.77.Final com.gitee.l0km @@ -112,7 +108,7 @@ io.undertow undertow-core - 2.2.16.Final + 2.2.17.Final @@ -145,7 +141,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-io/pom.xml b/cybench-java-benchmark-io/pom.xml index 1fad0ab..ff18788 100644 --- a/cybench-java-benchmark-io/pom.xml +++ b/cybench-java-benchmark-io/pom.xml @@ -32,11 +32,7 @@ jar ${project.io.version} - cybench-java-benchmark-io - - - cybench-java-benchmark-io - + ${project.artifactId} @@ -75,7 +71,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-json/pom.xml b/cybench-java-benchmark-json/pom.xml index acd57bb..ad3f2a1 100644 --- a/cybench-java-benchmark-json/pom.xml +++ b/cybench-java-benchmark-json/pom.xml @@ -32,11 +32,7 @@ jar ${project.json.version} - cybench-java-benchmark-json - - - cybench-java-benchmark-json - + ${project.artifactId} @@ -120,7 +116,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-list/pom.xml b/cybench-java-benchmark-list/pom.xml index 9872476..3e5a24d 100644 --- a/cybench-java-benchmark-list/pom.xml +++ b/cybench-java-benchmark-list/pom.xml @@ -32,11 +32,7 @@ jar ${project.list.version} - cybench-java-benchmark-list - - - cybench-java-benchmark-list - + ${project.artifactId} @@ -75,7 +71,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-mapping/pom.xml b/cybench-java-benchmark-mapping/pom.xml index 00f883d..81e1fdb 100644 --- a/cybench-java-benchmark-mapping/pom.xml +++ b/cybench-java-benchmark-mapping/pom.xml @@ -14,11 +14,7 @@ jar ${project.mapping.version} - cybench-java-benchmark-mapping - - - cybench-java-benchmark-mapping - + ${project.artifactId} @@ -62,7 +58,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-matrices/pom.xml b/cybench-java-benchmark-matrices/pom.xml index 918e0d4..7f190fa 100644 --- a/cybench-java-benchmark-matrices/pom.xml +++ b/cybench-java-benchmark-matrices/pom.xml @@ -13,11 +13,7 @@ jar ${project.matrices.version} - cybench-java-benchmark-matrices - - - cybench-java-benchmark-matrices - + ${project.artifactId} @@ -60,7 +56,7 @@ com.google.guava guava - 31.0.1-jre + 31.1-jre listenablefuture @@ -120,7 +116,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-number/pom.xml b/cybench-java-benchmark-number/pom.xml index 724d640..185caca 100644 --- a/cybench-java-benchmark-number/pom.xml +++ b/cybench-java-benchmark-number/pom.xml @@ -32,11 +32,7 @@ jar ${project.number.version} - cybench-java-benchmark-number - - - cybench-java-benchmark-number - + ${project.artifactId} @@ -75,7 +71,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-security-crypto/pom.xml b/cybench-java-benchmark-security-crypto/pom.xml index d3d16b8..fdb9a40 100644 --- a/cybench-java-benchmark-security-crypto/pom.xml +++ b/cybench-java-benchmark-security-crypto/pom.xml @@ -14,11 +14,7 @@ jar ${project.security.crypto.version} - cybench-java-benchmark-security-crypto - - - cybench-java-benchmark-security-crypto - + ${project.artifactId} @@ -63,7 +59,7 @@ false - ${jvm.jar.name} + ${project.artifactId} org.bouncycastle:*:*:* diff --git a/cybench-java-benchmark-security-rsa/pom.xml b/cybench-java-benchmark-security-rsa/pom.xml index a45a5c4..125cae1 100644 --- a/cybench-java-benchmark-security-rsa/pom.xml +++ b/cybench-java-benchmark-security-rsa/pom.xml @@ -14,11 +14,7 @@ jar ${project.security.rsa.version} - cybench-java-benchmark-security-rsa - - - cybench-java-benchmark-security-rsa - + ${project.artifactId} @@ -63,7 +59,7 @@ false - ${jvm.jar.name} + ${project.artifactId} org.bouncycastle:*:*:* diff --git a/cybench-java-benchmark-string/pom.xml b/cybench-java-benchmark-string/pom.xml index f93b3cc..b67db7b 100644 --- a/cybench-java-benchmark-string/pom.xml +++ b/cybench-java-benchmark-string/pom.xml @@ -32,11 +32,7 @@ jar ${project.string.version} - cybench-java-benchmark-string - - - cybench-java-benchmark-string - + ${project.artifactId} @@ -75,7 +71,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/cybench-java-benchmark-trace/pom.xml b/cybench-java-benchmark-trace/pom.xml index 2337063..3620ada 100644 --- a/cybench-java-benchmark-trace/pom.xml +++ b/cybench-java-benchmark-trace/pom.xml @@ -14,11 +14,7 @@ jar ${project.trace.version} - cybench-java-benchmark-trace - - - cybench-java-benchmark-trace - + ${project.artifactId} @@ -72,7 +68,7 @@ false - ${jvm.jar.name} + ${project.artifactId} *:* diff --git a/pom.xml b/pom.xml index afb16a0..bbc65e3 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ true CYBENCH_LICENSE* cybench-java-benchmarks - 1.34 - 2.13.1 + 1.35 + 2.13.3 5.8.2 @@ -122,7 +122,7 @@ ../cybench-java-benchmark-security-crypto ${project.security.crypto.home}/target/cybench-java-benchmark-security-crypto.jar ../deploy/security-crypto - 1.69 + 1.70 true src/assembly-security-rsa @@ -137,7 +137,7 @@ ../cybench-java-benchmark-trace ${project.trace.home}/target/cybench-java-benchmark-trace.jar ../deploy/trace - 1.11.0 + 1.14.0 2.14.3 src/assembly-mapping From 13fe8e9c8cde9fba9246f455281591320f9fe4c3 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Thu, 16 Jun 2022 09:38:25 +0300 Subject: [PATCH 13/17] Updated dependencies. Cleanup. --- cybench-java-benchmark-httpServers/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index bcff5e0..30c7517 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -52,7 +52,7 @@ org.takes takes - 1.19 + 1.20 commons-lang3 diff --git a/pom.xml b/pom.xml index bbc65e3..b66b6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ ${project.trace.home}/target/cybench-java-benchmark-trace.jar ../deploy/trace 1.14.0 - 2.14.3 + 2.15.0 src/assembly-mapping ../cybench-java-benchmark-mapping From 34f3ad8ec9256668ff81291ff1a9a73d0bc373e1 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 18 Jul 2022 11:47:29 +0300 Subject: [PATCH 14/17] Updated dependencies. Cleanup. --- cybench-java-benchmark-httpServers/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index 30c7517..57f2019 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -64,7 +64,7 @@ org.eclipse.jetty jetty-server - 9.4.46.v20220331 + 9.4.48.v20220622 diff --git a/pom.xml b/pom.xml index b66b6c7..4fc525f 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ ../cybench-java-benchmark-trace ${project.trace.home}/target/cybench-java-benchmark-trace.jar ../deploy/trace - 1.14.0 + 1.16.0 2.15.0 src/assembly-mapping From 661b8f76b0df2eb9c8e89e42b08c62705dfa6b90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:09:08 +0000 Subject: [PATCH 15/17] Bump undertow-core in /cybench-java-benchmark-httpServers Bumps [undertow-core](https://github.com/undertow-io/undertow) from 2.2.17.Final to 2.2.19.Final. - [Release notes](https://github.com/undertow-io/undertow/releases) - [Commits](https://github.com/undertow-io/undertow/compare/2.2.17.Final...2.2.19.Final) --- updated-dependencies: - dependency-name: io.undertow:undertow-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- cybench-java-benchmark-httpServers/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index 57f2019..d860be9 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -108,7 +108,7 @@ io.undertow undertow-core - 2.2.17.Final + 2.2.19.Final From 6709f03490d4dc31f09a7d0b2791bd7017bfc547 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Thu, 8 Sep 2022 08:44:04 +0300 Subject: [PATCH 16/17] Updated dependencies. Cleanup. --- cybench-java-benchmark-httpServers/pom.xml | 6 +++--- pom.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index d860be9..a5dbb53 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -52,7 +52,7 @@ org.takes takes - 1.20 + 1.24.4 commons-lang3 @@ -70,7 +70,7 @@ io.netty netty-all - 4.1.77.Final + 4.1.80.Final com.gitee.l0km @@ -81,7 +81,7 @@ com.sparkjava spark-core - 2.9.3 + 2.9.4 jetty-server diff --git a/pom.xml b/pom.xml index 4fc525f..068e43c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ CYBENCH_LICENSE* cybench-java-benchmarks 1.35 - 2.13.3 - 5.8.2 + 2.13.4 + 5.9.0 true @@ -137,8 +137,8 @@ ../cybench-java-benchmark-trace ${project.trace.home}/target/cybench-java-benchmark-trace.jar ../deploy/trace - 1.16.0 - 2.15.0 + 1.17.0 + 2.15.1 src/assembly-mapping ../cybench-java-benchmark-mapping From 053f19ef24db3e709f3f23cd9938272c2b181786 Mon Sep 17 00:00:00 2001 From: Andrius Kausinis Date: Mon, 26 Sep 2022 13:28:11 +0300 Subject: [PATCH 17/17] Updated dependencies. Cleanup. --- .../src/main/resources/archetype-resources/pom.xml | 1 - cybench-java-benchmark-httpServers/pom.xml | 5 ++--- cybench-java-benchmark-io/pom.xml | 1 - cybench-java-benchmark-json/pom.xml | 3 +-- cybench-java-benchmark-list/pom.xml | 1 - cybench-java-benchmark-mapping/pom.xml | 1 - cybench-java-benchmark-matrices/pom.xml | 1 - cybench-java-benchmark-number/pom.xml | 1 - cybench-java-benchmark-security-crypto/pom.xml | 2 -- cybench-java-benchmark-security-rsa/pom.xml | 2 -- cybench-java-benchmark-string/pom.xml | 1 - cybench-java-benchmark-trace/pom.xml | 1 - 12 files changed, 3 insertions(+), 17 deletions(-) diff --git a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index 16dd10d..98489f8 100644 --- a/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/cybench-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,6 @@ io.cybench.client cybench-java-benchmarks-utils 1.0.0 - compile diff --git a/cybench-java-benchmark-httpServers/pom.xml b/cybench-java-benchmark-httpServers/pom.xml index a5dbb53..9626708 100644 --- a/cybench-java-benchmark-httpServers/pom.xml +++ b/cybench-java-benchmark-httpServers/pom.xml @@ -39,7 +39,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile @@ -64,13 +63,13 @@ org.eclipse.jetty jetty-server - 9.4.48.v20220622 + 9.4.49.v20220914 io.netty netty-all - 4.1.80.Final + 4.1.82.Final com.gitee.l0km diff --git a/cybench-java-benchmark-io/pom.xml b/cybench-java-benchmark-io/pom.xml index ff18788..6f1c4b6 100644 --- a/cybench-java-benchmark-io/pom.xml +++ b/cybench-java-benchmark-io/pom.xml @@ -39,7 +39,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-json/pom.xml b/cybench-java-benchmark-json/pom.xml index ad3f2a1..8b42894 100644 --- a/cybench-java-benchmark-json/pom.xml +++ b/cybench-java-benchmark-json/pom.xml @@ -53,7 +53,7 @@ com.squareup.moshi moshi - 1.13.0 + 1.14.0 io.quarkus.qson @@ -84,7 +84,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-list/pom.xml b/cybench-java-benchmark-list/pom.xml index 3e5a24d..5632bfa 100644 --- a/cybench-java-benchmark-list/pom.xml +++ b/cybench-java-benchmark-list/pom.xml @@ -39,7 +39,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-mapping/pom.xml b/cybench-java-benchmark-mapping/pom.xml index 81e1fdb..859e756 100644 --- a/cybench-java-benchmark-mapping/pom.xml +++ b/cybench-java-benchmark-mapping/pom.xml @@ -21,7 +21,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile org.jctools diff --git a/cybench-java-benchmark-matrices/pom.xml b/cybench-java-benchmark-matrices/pom.xml index 7f190fa..3db731d 100644 --- a/cybench-java-benchmark-matrices/pom.xml +++ b/cybench-java-benchmark-matrices/pom.xml @@ -84,7 +84,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-number/pom.xml b/cybench-java-benchmark-number/pom.xml index 185caca..0382cd8 100644 --- a/cybench-java-benchmark-number/pom.xml +++ b/cybench-java-benchmark-number/pom.xml @@ -39,7 +39,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-security-crypto/pom.xml b/cybench-java-benchmark-security-crypto/pom.xml index fdb9a40..d5e68a2 100644 --- a/cybench-java-benchmark-security-crypto/pom.xml +++ b/cybench-java-benchmark-security-crypto/pom.xml @@ -21,13 +21,11 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile org.bouncycastle bcpkix-jdk15on ${bouncycastle.version} - compile diff --git a/cybench-java-benchmark-security-rsa/pom.xml b/cybench-java-benchmark-security-rsa/pom.xml index 125cae1..a54d335 100644 --- a/cybench-java-benchmark-security-rsa/pom.xml +++ b/cybench-java-benchmark-security-rsa/pom.xml @@ -21,13 +21,11 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile org.bouncycastle bcpkix-jdk15on ${bouncycastle.version} - compile diff --git a/cybench-java-benchmark-string/pom.xml b/cybench-java-benchmark-string/pom.xml index b67db7b..fb0dd97 100644 --- a/cybench-java-benchmark-string/pom.xml +++ b/cybench-java-benchmark-string/pom.xml @@ -39,7 +39,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile diff --git a/cybench-java-benchmark-trace/pom.xml b/cybench-java-benchmark-trace/pom.xml index 3620ada..9e27e15 100644 --- a/cybench-java-benchmark-trace/pom.xml +++ b/cybench-java-benchmark-trace/pom.xml @@ -21,7 +21,6 @@ io.cybench.client cybench-java-benchmarks-utils ${project.version} - compile io.opentelemetry