Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7d1c68f

Browse files
toyboxmantoyboxman
authoredNov 22, 2024··
Merge branch 'apache:griffin-2.0.0-dev' into griffin-2.0.0-dev
2 parents ed3f762 + 47af255 commit 7d1c68f

35 files changed

+1779
-23
lines changed
 

‎griffin-bom/pom.xml

+149-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ under the License.
2626
<groupId>org.apache.griffin</groupId>
2727
<artifactId>griffin</artifactId>
2828
<version>2.0.0-SNAPSHOT</version>
29-
<relativePath/>
3029
</parent>
3130

3231
<groupId>org.apache.griffin</groupId>
@@ -37,12 +36,160 @@ under the License.
3736
<url>https://griffin.apache.org</url>
3837

3938
<properties>
40-
39+
<spring-boot.version>2.7.3</spring-boot.version>
40+
<mybatis-plus.version>3.5.2</mybatis-plus.version>
41+
<commons-codec.version>1.11</commons-codec.version>
42+
<commons-logging.version>1.1.1</commons-logging.version>
43+
<commons-lang3.version>3.12.0</commons-lang3.version>
44+
<commons-httpclient>3.0.1</commons-httpclient>
45+
<commons-beanutils.version>1.9.4</commons-beanutils.version>
46+
<commons-configuration.version>1.10</commons-configuration.version>
47+
<commons-email.version>1.5</commons-email.version>
48+
<commons-collections4.version>4.3</commons-collections4.version>
49+
<httpclient.version>4.5.13</httpclient.version>
50+
<httpcore.version>4.4.15</httpcore.version>
51+
<jackson.version>2.13.4</jackson.version>
52+
<slf4j.version>1.7.36</slf4j.version>
53+
<logback.version>1.2.11</logback.version>
54+
<h2.version>2.2.220</h2.version>
55+
<mysql-connector.version>8.0.28</mysql-connector.version>
56+
<commons-io.version>2.11.0</commons-io.version>
57+
<presto-jdbc.version>0.238.1</presto-jdbc.version>
58+
<joda-time.version>2.10.13</joda-time.version>
59+
<spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
60+
<snakeyaml.version>1.33</snakeyaml.version>
4161
</properties>
4262

4363

4464
<dependencyManagement>
4565
<dependencies>
66+
<!-- spring -->
67+
<dependency>
68+
<groupId>org.springframework.boot</groupId>
69+
<artifactId>spring-boot-starter-parent</artifactId>
70+
<version>${spring-boot.version}</version>
71+
<type>pom</type>
72+
<scope>import</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.springframework</groupId>
76+
<artifactId>spring-test</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
80+
<!-- mybatis -->
81+
<dependency>
82+
<groupId>com.baomidou</groupId>
83+
<artifactId>mybatis-plus-boot-starter</artifactId>
84+
<version>${mybatis-plus.version}</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>com.baomidou</groupId>
88+
<artifactId>mybatis-plus</artifactId>
89+
<version>${mybatis-plus.version}</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>com.baomidou</groupId>
93+
<artifactId>mybatis-plus-annotation</artifactId>
94+
<version>${mybatis-plus.version}</version>
95+
</dependency>
96+
97+
<!-- jackson -->
98+
<dependency>
99+
<groupId>com.fasterxml.jackson.core</groupId>
100+
<artifactId>jackson-annotations</artifactId>
101+
<version>${jackson.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>com.fasterxml.jackson.core</groupId>
105+
<artifactId>jackson-databind</artifactId>
106+
<version>${jackson.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>com.fasterxml.jackson.core</groupId>
110+
<artifactId>jackson-core</artifactId>
111+
<version>${jackson.version}</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>com.fasterxml.jackson.datatype</groupId>
115+
<artifactId>jackson-datatype-jsr310</artifactId>
116+
<version>${jackson.version}</version>
117+
</dependency>
118+
119+
<!-- db connectors -->
120+
<dependency>
121+
<groupId>mysql</groupId>
122+
<artifactId>mysql-connector-java</artifactId>
123+
<version>${mysql-connector.version}</version>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>com.h2database</groupId>
128+
<artifactId>h2</artifactId>
129+
<version>${h2.version}</version>
130+
</dependency>
131+
132+
<!-- sl4j -->
133+
<dependency>
134+
<groupId>org.slf4j</groupId>
135+
<artifactId>slf4j-api</artifactId>
136+
<version>${slf4j.version}</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.slf4j</groupId>
140+
<artifactId>slf4j-log4j12</artifactId>
141+
<version>${slf4j.version}</version>
142+
</dependency>
143+
<!-- logback -->
144+
<dependency>
145+
<groupId>ch.qos.logback</groupId>
146+
<artifactId>logback-classic</artifactId>
147+
<version>${logback.version}</version>
148+
</dependency>
149+
<dependency>
150+
<groupId>ch.qos.logback</groupId>
151+
<artifactId>logback-core</artifactId>
152+
<version>${logback.version}</version>
153+
</dependency>
154+
155+
<dependency>
156+
<groupId>com.google.guava</groupId>
157+
<artifactId>guava</artifactId>
158+
<version>${guava.version}</version>
159+
</dependency>
160+
161+
<dependency>
162+
<groupId>org.apache.commons</groupId>
163+
<artifactId>commons-collections4</artifactId>
164+
<version>${commons-collections4.version}</version>
165+
</dependency>
166+
167+
<dependency>
168+
<groupId>commons-io</groupId>
169+
<artifactId>commons-io</artifactId>
170+
<version>${commons-io.version}</version>
171+
</dependency>
172+
173+
<dependency>
174+
<groupId>joda-time</groupId>
175+
<artifactId>joda-time</artifactId>
176+
<version>${joda-time.version}</version>
177+
</dependency>
178+
179+
<dependency>
180+
<groupId>org.springframework.cloud</groupId>
181+
<artifactId>spring-cloud-dependencies</artifactId>
182+
<version>${spring-cloud-dependencies.version}</version>
183+
<type>pom</type>
184+
<scope>import</scope>
185+
</dependency>
186+
187+
<dependency>
188+
<groupId>org.yaml</groupId>
189+
<artifactId>snakeyaml</artifactId>
190+
<version>${snakeyaml.version}</version>
191+
</dependency>
192+
46193
</dependencies>
47194
</dependencyManagement>
48195

‎griffin-metric/pom.xml

+93
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,98 @@ under the License.
3232
<name>${project.artifactId}</name>
3333
<packaging>jar</packaging>
3434

35+
<dependencyManagement>
36+
<dependencies>
37+
<dependency>
38+
<groupId>org.apache.griffin</groupId>
39+
<artifactId>griffin-bom</artifactId>
40+
<version>${project.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
44+
</dependencies>
45+
</dependencyManagement>
3546

47+
<dependencies>
48+
<!--springboot-->
49+
<dependency>
50+
<groupId>org.springframework.boot</groupId>
51+
<artifactId>spring-boot-starter-web</artifactId>
52+
<!-- <exclusions>-->
53+
<!-- <exclusion>-->
54+
<!-- <groupId>org.springframework.boot</groupId>-->
55+
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
56+
<!-- </exclusion>-->
57+
<!-- <exclusion>-->
58+
<!-- <groupId>org.apache.logging.log4j</groupId>-->
59+
<!-- <artifactId>log4j-to-slf4j</artifactId>-->
60+
<!-- </exclusion>-->
61+
<!-- </exclusions>-->
62+
</dependency>
63+
<!-- <dependency>-->
64+
<!-- <groupId>org.springframework.boot</groupId>-->
65+
<!-- <artifactId>spring-boot-starter-jetty</artifactId>-->
66+
<!-- <exclusions>-->
67+
<!-- <exclusion>-->
68+
<!-- <groupId>org.eclipse.jetty.websocket</groupId>-->
69+
<!-- <artifactId>javax-websocket-server-impl</artifactId>-->
70+
<!-- </exclusion>-->
71+
<!-- <exclusion>-->
72+
<!-- <groupId>org.eclipse.jetty.websocket</groupId>-->
73+
<!-- <artifactId>websocket-server</artifactId>-->
74+
<!-- </exclusion>-->
75+
<!-- </exclusions>-->
76+
<!-- </dependency>-->
77+
78+
<dependency>
79+
<groupId>org.apache.commons</groupId>
80+
<artifactId>commons-collections4</artifactId>
81+
</dependency>
82+
83+
<dependency>
84+
<groupId>com.baomidou</groupId>
85+
<artifactId>mybatis-plus</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>com.baomidou</groupId>
89+
<artifactId>mybatis-plus-boot-starter</artifactId>
90+
<exclusions>
91+
<exclusion>
92+
<groupId>org.apache.logging.log4j</groupId>
93+
<artifactId>log4j-to-slf4j</artifactId>
94+
</exclusion>
95+
</exclusions>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>org.springframework.boot</groupId>
100+
<artifactId>spring-boot-starter-test</artifactId>
101+
<scope>test</scope>
102+
</dependency>
103+
104+
<dependency>
105+
<groupId>com.zaxxer</groupId>
106+
<artifactId>HikariCP</artifactId>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>com.h2database</groupId>
111+
<artifactId>h2</artifactId>
112+
<!-- <scope>test</scope>-->
113+
</dependency>
114+
115+
<dependency>
116+
<groupId>mysql</groupId>
117+
<artifactId>mysql-connector-java</artifactId>
118+
</dependency>
119+
</dependencies>
120+
121+
<build>
122+
<plugins>
123+
<plugin>
124+
<groupId>org.springframework.boot</groupId>
125+
<artifactId>spring-boot-maven-plugin</artifactId>
126+
</plugin>
127+
</plugins>
128+
</build>
36129
</project>

‎griffin-metric/src/main/java/org/apache/griffin/metric/DAOApplication.java

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.griffin.metric;
19+
20+
import lombok.extern.slf4j.Slf4j;
21+
import org.springframework.boot.SpringApplication;
22+
import org.springframework.boot.autoconfigure.SpringBootApplication;
23+
24+
@Slf4j
25+
@SpringBootApplication
26+
public class DAOApplication {
27+
public static void main(String[] args) {
28+
SpringApplication.run(DAOApplication.class, args);
29+
}
30+
}

0 commit comments

Comments
 (0)
Please sign in to comment.