Skip to content

Commit 017917a

Browse files
author
iamazy
committed
Module Splitting
1 parent adadb2a commit 017917a

File tree

9 files changed

+199
-78
lines changed

9 files changed

+199
-78
lines changed

‎elasticsearch-sql-core/pom.xml‎

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -97,29 +97,7 @@
9797
</dependency>
9898
</dependencies>
9999

100-
<profiles>
101-
<profile>
102-
<id>disable-javadoc-doclint</id>
103-
<activation>
104-
<jdk>[13,)</jdk>
105-
</activation>
106-
<properties>
107-
<javadoc.opts>-Xdoclint:none</javadoc.opts>
108-
</properties>
109-
</profile>
110-
</profiles>
111-
112100
<build>
113-
<resources>
114-
<resource>
115-
<directory>${basedir}/src/main/resources</directory>
116-
<filtering>true</filtering>
117-
<includes>
118-
<include>es-plugin.properties</include>
119-
<include>plugin-descriptor.properties</include>
120-
</includes>
121-
</resource>
122-
</resources>
123101
<plugins>
124102
<plugin>
125103
<groupId>org.apache.maven.plugins</groupId>
@@ -167,49 +145,7 @@
167145
<goals>deploy</goals>
168146
</configuration>
169147
</plugin>
170-
<plugin>
171-
<artifactId>maven-resources-plugin</artifactId>
172-
<version>2.7</version>
173-
<executions>
174-
<execution>
175-
<id>copy-resources</id>
176-
<phase>validate</phase>
177-
<goals>
178-
<goal>copy-resources</goal>
179-
</goals>
180-
<configuration>
181-
<outputDirectory>${project.build.directory}</outputDirectory>
182-
<resources>
183-
<resource>
184-
<directory>${basedir}/src/main/resources</directory>
185-
<filtering>true</filtering>
186-
<includes>
187-
<include>plugin-descriptor.properties</include>
188-
</includes>
189-
</resource>
190-
</resources>
191-
</configuration>
192-
</execution>
193-
</executions>
194-
</plugin>
195-
<plugin>
196-
<artifactId>maven-assembly-plugin</artifactId>
197-
<version>3.1.1</version>
198-
<executions>
199-
<execution>
200-
<phase>package</phase>
201-
<goals>
202-
<goal>single</goal>
203-
</goals>
204-
</execution>
205-
</executions>
206-
<configuration>
207-
<descriptors>
208-
<descriptor>${basedir}/src/assembly/zip.xml</descriptor>
209-
</descriptors>
210-
<finalName>elasticsearch</finalName>
211-
</configuration>
212-
</plugin>
148+
213149
<!--执行测试用例的插件-->
214150
<plugin>
215151
<groupId>org.apache.maven.plugins</groupId>
@@ -238,17 +174,6 @@
238174
</tag>
239175
</tags>
240176
</configuration>
241-
<!-- <executions>-->
242-
<!-- <execution>-->
243-
<!-- <id>attach-javadocs</id>-->
244-
<!-- <goals>-->
245-
<!-- <goal>jar</goal>-->
246-
<!-- </goals>-->
247-
<!-- <configuration>-->
248-
<!-- <additionalparam>-Xdoclint:none</additionalparam>-->
249-
<!-- </configuration>-->
250-
<!-- </execution>-->
251-
<!-- </executions>-->
252177
</plugin>
253178
<plugin>
254179
<groupId>org.apache.maven.plugins</groupId>

‎isql-plugin/pom.xml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>elasticsearch-sql</artifactId>
7+
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
8+
<version>7.5.1</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>isql-plugin</artifactId>
13+
14+
<properties>
15+
<elasticsearch.plugin.name>isql</elasticsearch.plugin.name>
16+
<elasticsearch.plugin.classname>io.github.iamazy.elasticsearch.dsl.plugin.SqlPlugin</elasticsearch.plugin.classname>
17+
</properties>
18+
19+
<dependencies>
20+
<dependency>
21+
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
22+
<artifactId>elasticsearch-sql-core</artifactId>
23+
<version>${elasticsearch.version}</version>
24+
</dependency>
25+
</dependencies>
26+
27+
<build>
28+
<resources>
29+
<resource>
30+
<directory>${basedir}/src/main/resources</directory>
31+
<filtering>true</filtering>
32+
<includes>
33+
<include>es-plugin.properties</include>
34+
<include>plugin-descriptor.properties</include>
35+
</includes>
36+
</resource>
37+
</resources>
38+
<plugins>
39+
<plugin>
40+
<artifactId>maven-resources-plugin</artifactId>
41+
<version>2.7</version>
42+
<executions>
43+
<execution>
44+
<id>copy-resources</id>
45+
<phase>validate</phase>
46+
<goals>
47+
<goal>copy-resources</goal>
48+
</goals>
49+
<configuration>
50+
<outputDirectory>${project.build.directory}</outputDirectory>
51+
<resources>
52+
<resource>
53+
<directory>${basedir}/src/main/resources</directory>
54+
<filtering>true</filtering>
55+
<includes>
56+
<include>plugin-descriptor.properties</include>
57+
</includes>
58+
</resource>
59+
</resources>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
<plugin>
65+
<artifactId>maven-assembly-plugin</artifactId>
66+
<version>3.1.1</version>
67+
<executions>
68+
<execution>
69+
<phase>package</phase>
70+
<goals>
71+
<goal>single</goal>
72+
</goals>
73+
</execution>
74+
</executions>
75+
<configuration>
76+
<descriptors>
77+
<descriptor>../isql-plugin/src/assembly/zip.xml</descriptor>
78+
</descriptors>
79+
<finalName>elasticsearch</finalName>
80+
</configuration>
81+
</plugin>
82+
</plugins>
83+
</build>
84+
</project>

‎elasticsearch-sql-core/src/assembly/zip.xml‎ renamed to ‎isql-plugin/src/assembly/zip.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,21 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 ">
3939
<outputDirectory/>
4040
<useProjectArtifact>true</useProjectArtifact>
4141
<useTransitiveFiltering>true</useTransitiveFiltering>
42+
<useStrictFiltering>true</useStrictFiltering>
4243
<includes>
44+
<include>io.github.iamazy.elasticsearch.dsl:elasticsearch-sql-core</include>
4345
<include>com.google.guava:guava</include>
4446
<include>org.apache.commons:commons-collections4</include>
4547
<include>org.apache.commons:commons-lang3</include>
4648
<include>org.antlr:antlr4-runtime</include>
4749
<include>org.elasticsearch.plugin:parent-join-client</include>
4850
<include>com.fasterxml.jackson.core:jackson-annotations</include>
4951
</includes>
52+
<excludes>
53+
<exclude>org.elasticsearch:elasticsearch*:*</exclude>
54+
<exclude>org.locationtech.spatial4j:spatial4j</exclude>
55+
<exclude>org.locationtech.jts:jts-core</exclude>
56+
</excludes>
5057
</dependencySet>
5158
</dependencySets>
5259
</assembly>

‎elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/RestSqlAction.java‎ renamed to ‎isql-plugin/src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/RestSqlAction.java‎

File renamed without changes.

‎elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/SqlPlugin.java‎ renamed to ‎isql-plugin/src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/SqlPlugin.java‎

File renamed without changes.

‎elasticsearch-sql-core/src/main/resources/es-plugin.properties‎ renamed to ‎isql-plugin/src/main/resources/es-plugin.properties‎

File renamed without changes.

‎elasticsearch-sql-core/src/main/resources/plugin-descriptor.properties‎ renamed to ‎isql-plugin/src/main/resources/plugin-descriptor.properties‎

File renamed without changes.

‎elasticsearch-sql-core/src/main/resources/plugin-security.policy‎ renamed to ‎isql-plugin/src/main/resources/plugin-security.policy‎

File renamed without changes.

‎pom.xml‎

Lines changed: 107 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<modules>
1717
<module>elasticsearch-sql-core</module>
1818
<module>elasticsearch-sql-jdbc</module>
19+
<module>isql-plugin</module>
1920
</modules>
2021

2122

@@ -25,8 +26,6 @@
2526
<antlr4.version>4.7.2</antlr4.version>
2627
<jackson.version>2.10.0</jackson.version>
2728
<guava.version>28.1-jre</guava.version>
28-
<elasticsearch.plugin.name>isql</elasticsearch.plugin.name>
29-
<elasticsearch.plugin.classname>io.github.iamazy.elasticsearch.dsl.plugin.SqlPlugin</elasticsearch.plugin.classname>
3029
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
3130
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3231
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -73,4 +72,110 @@
7372
</repository>
7473
</distributionManagement>
7574

75+
<profiles>
76+
<profile>
77+
<id>disable-javadoc-doclint</id>
78+
<activation>
79+
<jdk>[13,)</jdk>
80+
</activation>
81+
<properties>
82+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
83+
</properties>
84+
</profile>
85+
</profiles>
86+
87+
<build>
88+
<plugins>
89+
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
91+
<artifactId>maven-compiler-plugin</artifactId>
92+
<version>3.8.0</version>
93+
<configuration>
94+
<source>${maven.compiler.source}</source>
95+
<target>${maven.compiler.target}</target>
96+
</configuration>
97+
</plugin>
98+
<plugin>
99+
<artifactId>maven-source-plugin</artifactId>
100+
<version>3.0.1</version>
101+
<configuration>
102+
<attach>true</attach>
103+
</configuration>
104+
<executions>
105+
<execution>
106+
<phase>compile</phase>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.sonatype.plugins</groupId>
115+
<artifactId>nexus-staging-maven-plugin</artifactId>
116+
<version>1.6.3</version>
117+
<extensions>true</extensions>
118+
<configuration>
119+
<serverId>ossrh</serverId>
120+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
121+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
122+
</configuration>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-release-plugin</artifactId>
127+
<version>2.5.3</version>
128+
<configuration>
129+
<autoVersionSubmodules>true</autoVersionSubmodules>
130+
<useReleaseProfile>false</useReleaseProfile>
131+
<releaseProfiles>release</releaseProfiles>
132+
<goals>deploy</goals>
133+
</configuration>
134+
</plugin>
135+
136+
<!--执行测试用例的插件-->
137+
<plugin>
138+
<groupId>org.apache.maven.plugins</groupId>
139+
<artifactId>maven-surefire-plugin</artifactId>
140+
<version>2.22.2</version>
141+
</plugin>
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-javadoc-plugin</artifactId>
145+
<version>3.1.1</version>
146+
<configuration>
147+
<charset>UTF-8</charset>
148+
<encoding>UTF-8</encoding>
149+
<docencoding>UTF-8</docencoding>
150+
<defaultAuthor>iamazy</defaultAuthor>
151+
<tags>
152+
<tag>
153+
<name>date</name>
154+
<placement>a</placement>
155+
<head>date:</head>
156+
</tag>
157+
<tag>
158+
<name>description</name>
159+
<placement>a</placement>
160+
<head>description:</head>
161+
</tag>
162+
</tags>
163+
</configuration>
164+
</plugin>
165+
<plugin>
166+
<groupId>org.apache.maven.plugins</groupId>
167+
<artifactId>maven-gpg-plugin</artifactId>
168+
<version>1.6</version>
169+
<executions>
170+
<execution>
171+
<id>ossrh</id>
172+
<phase>verify</phase>
173+
<goals>
174+
<goal>sign</goal>
175+
</goals>
176+
</execution>
177+
</executions>
178+
</plugin>
179+
</plugins>
180+
</build>
76181
</project>

0 commit comments

Comments
 (0)