[ci fw-only Java/act] Docker act 1.8.1 (#3405)

* add act-ebean-pgsql-rythm to compare rythm vs mustache template engine

* Rust/may-minihttp add may-minihttp framework (#3354)

* rename actframework to act; update to act-1.8.1

* [ci fw-only Java/act] fix FROM issue in dockerfiles

* [ci fw-only Java/act] remove frameworks/Rust/may-minihttp/setup.sh

frameworks/Java/act/actframework-ebean-mysql-rythm.dockerfile → frameworks/Java/act/act-ebean-mysql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pebean_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-ebean-mysql.dockerfile → frameworks/Java/act/act-ebean-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pebean_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-ebean-pgsql-rythm.dockerfile → frameworks/Java/act/act-ebean-pgsql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pebean_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-ebean-pgsql.dockerfile → frameworks/Java/act/act-ebean-pgsql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pebean_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-eclipselink-mysql-rythm.dockerfile → frameworks/Java/act/act-eclipselink-mysql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Peclipselink_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-eclipselink-mysql.dockerfile → frameworks/Java/act/act-eclipselink-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Peclipselink_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-eclipselink-pgsql-rythm.dockerfile → frameworks/Java/act/act-eclipselink-pgsql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Peclipselink_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-eclipselink-pgsql.dockerfile → frameworks/Java/act/act-eclipselink-pgsql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Peclipselink_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-hibernate-mysql-rythm.dockerfile → frameworks/Java/act/act-hibernate-mysql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Phibernate_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-hibernate-mysql.dockerfile → frameworks/Java/act/act-hibernate-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Phibernate_mysql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-hibernate-pgsql-rythm.dockerfile → frameworks/Java/act/act-hibernate-pgsql-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Phibernate_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-hibernate-pgsql.dockerfile → frameworks/Java/act/act-hibernate-pgsql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Phibernate_pgsql clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-morphia-mongo-rythm.dockerfile → frameworks/Java/act/act-morphia-mongo-rythm.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pmongo clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework-morphia-mongo.dockerfile → frameworks/Java/act/act-morphia-mongo.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn -Pmongo clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/actframework.dockerfile → frameworks/Java/act/act.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/actframework-base:latest
+FROM tfb/act-base:latest
 RUN mvn clean package
 WORKDIR /act/target/dist
 RUN unzip -q *.zip

frameworks/Java/act/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "actframework",
+  "framework": "act",
   "tests": [{
       "default": {
       "json_url": "/json",
@@ -16,7 +16,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "actframework",
+      "display_name": "act",
       "notes": "",
       "versus": "undertow"
     },
@@ -55,7 +55,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-ebean-pgsql",
+      "display_name": "act-ebean-pgsql-rythm",
       "notes": "",
       "versus": "undertow-postgresql"
     },
@@ -94,7 +94,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-ebean-mysql",
+      "display_name": "act-ebean-mysql-rythm",
       "notes": "",
       "versus": "undertow-mysql"
     },
@@ -133,7 +133,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-hibernate-pgsql",
+      "display_name": "act-hibernate-pgsql-rythm",
       "notes": "",
       "versus": "undertow-postgresql"
     },
@@ -172,7 +172,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-hibernate-mysql",
+      "display_name": "act-hibernate-mysql-rythm",
       "notes": "",
       "versus": "undertow-mysql"
     },
@@ -211,7 +211,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-eclipselink-pgsql",
+      "display_name": "act-eclipselink-pgsql-rythm",
       "notes": "",
       "versus": "undertow-postgresql"
     },
@@ -250,7 +250,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-eclipselink-mysql",
+      "display_name": "act-eclipselink-mysql-rythm",
       "notes": "",
       "versus": "undertow-mysql"
     },
@@ -271,7 +271,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-morphia",
+      "display_name": "act-morphia-mongo",
       "notes": "",
       "versus": "undertow-mongodb"
     },
@@ -289,7 +289,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "act-morphia",
+      "display_name": "act-morphia-mongo-rythm",
       "notes": "",
       "versus": "undertow-mongodb"
     }

frameworks/Java/act/pom.xml

@@ -22,7 +22,7 @@
   <groupId>com.techempower</groupId>
   <artifactId>actframework</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.0</version>
+  <version>1.8.1</version>
 
   <name>TEB ActFramework Project</name>
   <description>TEB benchmark project with ActFramework</description>
@@ -36,23 +36,13 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>act-starter-parent</artifactId>
-    <version>1.6.6.0</version>
+    <version>1.8.1.0</version>
   </parent>
 
   <properties>
     <java.version>1.8</java.version>
-    <HikariCP.version>2.7.3</HikariCP.version>
     <mysql.version>5.1.45</mysql.version>
     <postgres-jdbc.version>42.2.1</postgres-jdbc.version>
-    <morphia.version>1.3.2</morphia.version>
-    <ebean.version>11.9.1</ebean.version>
-    <act-sql-common.version>1.3.0-teb-SNAPSHOT</act-sql-common.version>
-    <act-hibernate.version>1.0.0-teb-SNAPSHOT</act-hibernate.version>
-    <act-eclipselink.version>1.0.0-teb-SNAPSHOT</act-eclipselink.version>
-    <act-ebean.version>1.4.0-teb-SNAPSHOT</act-ebean.version>
-    <act-morphia.version>1.4.0-teb-SNAPSHOT</act-morphia.version>
-    <act-mustache.version>1.3.0</act-mustache.version>
-    <act.version>1.7.0-teb-SNAPSHOT</act.version>
     <app.entry>com.techempower.act.AppEntry</app.entry>
   </properties>
 
@@ -62,33 +52,11 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.actframework</groupId>
-      <artifactId>act</artifactId>
-      <version>${act.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.actframework</groupId>
       <artifactId>act-mustache</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.actframework</groupId>
-      <artifactId>act-sql-common</artifactId>
-      <version>${act-sql-common.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.avaje.ebean</groupId>
-          <artifactId>ebean</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.avaje.ebean</groupId>
-          <artifactId>ebean-agent</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
@@ -98,7 +66,13 @@
     <dependency>
       <groupId>org.mongodb.morphia</groupId>
       <artifactId>morphia</artifactId>
-      <version>${morphia.version}</version>
+      <version>1.3.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.actframework</groupId>
+      <artifactId>act-jpa-common</artifactId>
+      <version>1.2.1</version>
     </dependency>
 
   </dependencies>
@@ -113,7 +87,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-morphia</artifactId>
-          <version>${act-morphia.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -126,12 +99,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-ebean2</artifactId>
-          <version>${act-ebean.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>io.ebean</groupId>
-          <artifactId>ebean</artifactId>
-          <version>${ebean.version}</version>
         </dependency>
         <dependency>
           <groupId>mysql</groupId>
@@ -141,7 +108,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -154,7 +120,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-hibernate</artifactId>
-          <version>${act-hibernate.version}</version>
         </dependency>
         <dependency>
           <groupId>mysql</groupId>
@@ -164,7 +129,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -177,7 +141,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-eclipselink</artifactId>
-          <version>${act-eclipselink.version}</version>
         </dependency>
         <dependency>
           <groupId>mysql</groupId>
@@ -187,7 +150,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -200,12 +162,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-ebean2</artifactId>
-          <version>${act-ebean.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>io.ebean</groupId>
-          <artifactId>ebean</artifactId>
-          <version>${ebean.version}</version>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>
@@ -215,7 +171,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -228,7 +183,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-hibernate</artifactId>
-          <version>${act-hibernate.version}</version>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>
@@ -238,7 +192,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -251,7 +204,6 @@
         <dependency>
           <groupId>org.actframework</groupId>
           <artifactId>act-eclipselink</artifactId>
-          <version>${act-eclipselink.version}</version>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>
@@ -261,7 +213,6 @@
         <dependency>
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP</artifactId>
-          <version>${HikariCP.version}</version>
         </dependency>
       </dependencies>
     </profile>

frameworks/Rust/may-minihttp/benchmark_config.json

@@ -20,4 +20,4 @@
       }
     }
   ]
-}
+}