Skip to content

Commit

Permalink
Bump H2 version to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnuGayan
AnuGayan committed Mar 3, 2022
1 parent be9ee36 commit c46ddca
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion components/org.wso2.carbon.metrics.jdbc.core/pom.xml
View file
Expand Up @@ -84,7 +84,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.h2database</groupId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...arbon.metrics.jdbc.core/src/test/java/org/wso2/carbon/metrics/jdbc/core/ReporterTest.java
View file
Expand Up @@ -114,7 +114,7 @@ public void testJDBCReporter() {
template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ?", gaugeName);
Assert.assertEquals(gaugeResult.size(), 1);
Assert.assertEquals(gaugeResult.get(0).get("NAME"), gaugeName);
Assert.assertEquals(gaugeResult.get(0).get("VALUE"), "1");
Assert.assertEquals(gaugeResult.get(0).get("METRIC_GAUGE"), "1");
Assert.assertEquals(gaugeResult.get(0).get("SOURCE"), "Carbon-jdbc");
}

Expand All @@ -134,7 +134,7 @@ public void testJDBCReporterCachedGauge() {
template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ?", gaugeName);
Assert.assertEquals(gaugeResult.size(), 1);
Assert.assertEquals(gaugeResult.get(0).get("NAME"), gaugeName);
Assert.assertEquals(gaugeResult.get(0).get("VALUE"), "1");
Assert.assertEquals(gaugeResult.get(0).get("METRIC_GAUGE"), "1");
Assert.assertEquals(gaugeResult.get(0).get("SOURCE"), "Carbon-jdbc");

adder.increment();
Expand All @@ -145,7 +145,7 @@ public void testJDBCReporterCachedGauge() {
template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ? ORDER BY TIMESTAMP", gaugeName);
Assert.assertEquals(gaugeResult2.size(), 2);
Assert.assertEquals(gaugeResult2.get(1).get("NAME"), gaugeResult2.get(0).get("NAME"));
Assert.assertEquals(gaugeResult2.get(1).get("VALUE"), gaugeResult2.get(0).get("VALUE"));
Assert.assertEquals(gaugeResult2.get(1).get("METRIC_GAUGE"), gaugeResult2.get(0).get("METRIC_GAUGE"));
Assert.assertEquals(gaugeResult2.get(1).get("SOURCE"), gaugeResult2.get(0).get("SOURCE"));
}

Expand Down
2 changes: 1 addition & 1 deletion components/org.wso2.carbon.metrics.jdbc.reporter/pom.xml
View file
Expand Up @@ -64,7 +64,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.h2database</groupId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...trics.jdbc.reporter/src/main/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporter.java
View file
Expand Up @@ -147,7 +147,7 @@ public JdbcReporter build(String source, DataSource dataSource) {
private final TimeUnit timestampUnit;

private static final String INSERT_GAUGE_QUERY =
"INSERT INTO METRIC_GAUGE (SOURCE, TIMESTAMP, NAME, VALUE) VALUES (?,?,?,?)";
"INSERT INTO METRIC_GAUGE (SOURCE, TIMESTAMP, NAME, METRIC_GAUGE) VALUES (?,?,?,?)";
private static final String INSERT_COUNTER_QUERY =
"INSERT INTO METRIC_COUNTER (SOURCE, TIMESTAMP, NAME, COUNT) VALUES (?,?,?,?)";
private static final String INSERT_METER_QUERY =
Expand Down
2 changes: 1 addition & 1 deletion ...s.jdbc.reporter/src/test/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporterTest.java
View file
Expand Up @@ -105,7 +105,7 @@ public void reportsGaugeValues() {
List<Map<String, Object>> result = template.queryForList("SELECT * FROM METRIC_GAUGE");
Assert.assertEquals(result.size(), 1);
Assert.assertEquals(result.get(0).get("NAME"), "gauge");
Assert.assertEquals(result.get(0).get("VALUE"), "1");
Assert.assertEquals(result.get(0).get("METRIC_GAUGE"), "1");
Assert.assertEquals(result.get(0).get("SOURCE"), SOURCE);
Assert.assertEquals(result.get(0).get("TIMESTAMP"), timestamp);
}
Expand Down
2 changes: 1 addition & 1 deletion components/org.wso2.carbon.metrics.jdbc.reporter/src/test/resources/dbscripts/h2.sql
View file
Expand Up @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP BIGINT NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL
METRIC_GAUGE VARCHAR(100) NOT NULL
);

CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
Expand Down
6 changes: 3 additions & 3 deletions features/org.wso2.carbon.metrics.jdbc.core.feature/pom.xml
View file
Expand Up @@ -39,7 +39,7 @@
<artifactId>org.wso2.carbon.metrics.jdbc.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.h2database</groupId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -96,7 +96,7 @@
<path refid="maven.compile.classpath" />
</path>
<echo message="########### Creating Carbon Metrics Database ##############" />
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/database/metrics;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/database/metrics" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down Expand Up @@ -166,7 +166,7 @@
<version>${carbon.metrics.version}</version>
</bundle>
<bundle>
<symbolicName>h2</symbolicName>
<symbolicName>com.h2database</symbolicName>
<version>${h2.version}</version>
</bundle>
</bundles>
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/h2.sql
View file
Expand Up @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP BIGINT NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL
METRIC_GAUGE VARCHAR(100) NOT NULL
);

CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mssql.sql
View file
Expand Up @@ -20,7 +20,7 @@ CREATE TABLE METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP BIGINT NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL,
METRIC_GAUGE VARCHAR(100) NOT NULL,
);

IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[METRIC_COUNTER]') AND TYPE IN (N'U'))
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mysql.sql
View file
Expand Up @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP BIGINT NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL
METRIC_GAUGE VARCHAR(100) NOT NULL
);

CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/oracle.sql
View file
Expand Up @@ -19,7 +19,7 @@ CREATE TABLE METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP NUMBER(20) NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL
METRIC_GAUGE VARCHAR(100) NOT NULL
)
/
CREATE SEQUENCE METRIC_GAUGE_SEQUENCE START WITH 1 INCREMENT BY 1 NOCACHE
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/postgresql.sql
View file
Expand Up @@ -21,7 +21,7 @@ CREATE TABLE METRIC_GAUGE (
SOURCE VARCHAR(255) NOT NULL,
TIMESTAMP BIGINT NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE VARCHAR(100) NOT NULL
METRIC_GAUGE VARCHAR(100) NOT NULL
);

CREATE SEQUENCE METRIC_COUNTER_SEQUENCE START WITH 1 INCREMENT BY 1;
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -340,7 +340,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.h2database</groupId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
Expand Down Expand Up @@ -855,7 +855,7 @@
<slf4j.version.range>[1.7.0,1.8.0)</slf4j.version.range>
<log4j.version>2.9.1</log4j.version>
<hikaricp.version>2.7.2</hikaricp.version>
<h2.version>1.4.199.wso2v1</h2.version>
<h2.version>2.1.210</h2.version>
<spring.version>5.0.1.RELEASE</spring.version>
<mockito.version>2.11.0</mockito.version>
<tomcat.version>9.0.1</tomcat.version>
Expand Down
2 changes: 1 addition & 1 deletion tests/osgi-tests/pom.xml
View file
Expand Up @@ -127,7 +127,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.h2database</groupId>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
Expand Down

0 comments on commit c46ddca

Please sign in to comment.