Browse Source

[ci fw-only Java/act] experiement - take HikariCP out from eclipselink-mysql permutations (#3929)

Green Luo 7 years ago
parent
commit
aac79602b8
2 changed files with 29 additions and 29 deletions
  1. 4 0
      frameworks/Java/act/CHANGELOG.md
  2. 25 29
      frameworks/Java/act/pom.xml

+ 4 - 0
frameworks/Java/act/CHANGELOG.md

@@ -1,5 +1,9 @@
 TechEmpower Framework Benchmark - ActFramework Change log
 
+**1.8.8f**
+
+* experiment: take HikariCP from eclipse-mysql permutations
+
 **1.8.8e**
 
 * update act to 1.8.8-RC12-SNAPSHOT

+ 25 - 29
frameworks/Java/act/pom.xml

@@ -22,7 +22,7 @@
   <groupId>com.techempower</groupId>
   <artifactId>actframework</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.8e</version>
+  <version>1.8.8f</version>
 
   <name>TEB ActFramework Project</name>
   <description>TEB benchmark project with ActFramework</description>
@@ -122,35 +122,31 @@
       </dependencies>
     </profile>
     <profile>
-      <id>hibernate_mysql</id>
+      <id>ebean_pgsql</id>
       <build>
-        <finalName>teb-act-hibernate-mysql</finalName>
+        <finalName>teb-act-ebean-pgsql</finalName>
       </build>
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-hibernate</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-          <version>${mysql.version}</version>
+          <artifactId>act-ebean</artifactId>
         </dependency>
         <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP</artifactId>
+          <groupId>org.postgresql</groupId>
+          <artifactId>postgresql</artifactId>
+          <version>${postgres-jdbc.version}</version>
         </dependency>
       </dependencies>
     </profile>
     <profile>
-      <id>eclipselink_mysql</id>
+      <id>hibernate_mysql</id>
       <build>
-        <finalName>teb-act-eclipselink-mysql</finalName>
+        <finalName>teb-act-hibernate-mysql</finalName>
       </build>
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-eclipselink</artifactId>
+          <artifactId>act-hibernate</artifactId>
         </dependency>
         <dependency>
           <groupId>mysql</groupId>
@@ -164,31 +160,35 @@
       </dependencies>
     </profile>
     <profile>
-      <id>ebean_pgsql</id>
+      <id>hibernate_pgsql</id>
       <build>
-        <finalName>teb-act-ebean-pgsql</finalName>
+        <finalName>teb-act-hibernate-pgsql</finalName>
       </build>
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-ebean</artifactId>
+          <artifactId>act-hibernate</artifactId>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>
           <artifactId>postgresql</artifactId>
           <version>${postgres-jdbc.version}</version>
         </dependency>
+        <dependency>
+          <groupId>com.zaxxer</groupId>
+          <artifactId>HikariCP</artifactId>
+        </dependency>
       </dependencies>
     </profile>
     <profile>
-      <id>hibernate_pgsql</id>
+      <id>eclipselink_pgsql</id>
       <build>
-        <finalName>teb-act-hibernate-pgsql</finalName>
+        <finalName>teb-act-eclipselink-pgsql</finalName>
       </build>
       <dependencies>
         <dependency>
           <groupId>org.actframework</groupId>
-          <artifactId>act-hibernate</artifactId>
+          <artifactId>act-eclipselink</artifactId>
         </dependency>
         <dependency>
           <groupId>org.postgresql</groupId>
@@ -202,9 +202,9 @@
       </dependencies>
     </profile>
     <profile>
-      <id>eclipselink_pgsql</id>
+      <id>eclipselink_mysql</id>
       <build>
-        <finalName>teb-act-eclipselink-pgsql</finalName>
+        <finalName>teb-act-eclipselink-mysql</finalName>
       </build>
       <dependencies>
         <dependency>
@@ -212,13 +212,9 @@
           <artifactId>act-eclipselink</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-          <version>${postgres-jdbc.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP</artifactId>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+          <version>${mysql.version}</version>
         </dependency>
       </dependencies>
     </profile>