Skip to content

Commit 68a2a8d

Browse files
chirinochirino
committed
Convert mvn build to multi-module.
Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>
1 parent e896029 commit 68a2a8d

File tree

152 files changed

+254
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+254
-211
lines changed

‎pom.xml‎

Lines changed: 149 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>io.roastedroot</groupId>
6-
<artifactId>proxy-wasm-java-host</artifactId>
6+
<artifactId>proxy-wasm-java-host-parent</artifactId>
77
<version>1.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
8+
<packaging>pom</packaging>
99

10-
<name>proxy-wasm-java-host</name>
10+
<name>proxy-wasm-java-host-parent</name>
1111
<url>https://github.com/roastedroot/proxy-wasm-java-host/</url>
1212

1313
<licenses>
@@ -19,6 +19,10 @@
1919
</license>
2020
</licenses>
2121

22+
<modules>
23+
<module>proxy-wasm-java-host</module>
24+
</modules>
25+
2226
<properties>
2327
<!-- build settings -->
2428
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,220 +46,154 @@
4246
<chicory.version>1.1.0</chicory.version>
4347
</properties>
4448

45-
<dependencies>
46-
<dependency>
47-
<groupId>com.dylibso.chicory</groupId>
48-
<artifactId>aot-experimental</artifactId>
49-
<version>${chicory.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>com.dylibso.chicory</groupId>
53-
<artifactId>host-module-annotations-experimental</artifactId>
54-
<version>${chicory.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>com.dylibso.chicory</groupId>
58-
<artifactId>runtime</artifactId>
59-
<version>${chicory.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>com.dylibso.chicory</groupId>
63-
<artifactId>wasi</artifactId>
64-
<version>${chicory.version}</version>
65-
</dependency>
66-
67-
<!-- ============= Testing ============= -->
68-
<dependency>
69-
<groupId>org.junit.jupiter</groupId>
70-
<artifactId>junit-jupiter-api</artifactId>
71-
<version>${junit.version}</version>
72-
<scope>test</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.junit.jupiter</groupId>
76-
<artifactId>junit-jupiter-engine</artifactId>
77-
<version>${junit.version}</version>
78-
<scope>test</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.junit.jupiter</groupId>
82-
<artifactId>junit-jupiter-params</artifactId>
83-
<version>${junit.version}</version>
84-
<scope>test</scope>
85-
</dependency>
86-
87-
</dependencies>
8849
<build>
89-
<plugins>
90-
91-
<plugin>
92-
<groupId>com.diffplug.spotless</groupId>
93-
<artifactId>spotless-maven-plugin</artifactId>
94-
<version>${spotless-maven-plugin.version}</version>
95-
<configuration>
96-
<formats>
97-
<format>
50+
<pluginManagement>
51+
<plugins>
52+
<plugin>
53+
<groupId>com.diffplug.spotless</groupId>
54+
<artifactId>spotless-maven-plugin</artifactId>
55+
<version>${spotless-maven-plugin.version}</version>
56+
<configuration>
57+
<formats>
58+
<format>
59+
<includes>
60+
<include>*.md</include>
61+
<include>.gitignore</include>
62+
</includes>
63+
<trimTrailingWhitespace/>
64+
<endWithNewline/>
65+
<indent>
66+
<spaces>true</spaces>
67+
<spacesPerTab>2</spacesPerTab>
68+
</indent>
69+
</format>
70+
</formats>
71+
<java>
9872
<includes>
99-
<include>*.md</include>
100-
<include>.gitignore</include>
73+
<include>**/src/main/java/**/*.java</include>
74+
<include>**/src/test/java/**/*.java</include>
10175
</includes>
102-
<trimTrailingWhitespace/>
103-
<endWithNewline/>
104-
<indent>
105-
<spaces>true</spaces>
106-
<spacesPerTab>2</spacesPerTab>
107-
</indent>
108-
</format>
109-
</formats>
110-
<java>
111-
<includes>
112-
<include>**/src/main/java/**/*.java</include>
113-
<include>**/src/test/java/**/*.java</include>
114-
</includes>
115-
<googleJavaFormat>
116-
<version>1.18.1</version>
117-
<style>AOSP</style>
118-
<reflowLongStrings>true</reflowLongStrings>
119-
<formatJavadoc>false</formatJavadoc>
120-
</googleJavaFormat>
121-
<importOrder/>
122-
<replaceRegex>
123-
<name>Remove wildcard imports</name>
124-
<searchRegex>import\s+(?:static\s+)?[^\*\s]+\*;(\r\n|\r|\n)</searchRegex>
125-
<replacement>$1</replacement>
126-
</replaceRegex>
127-
<removeUnusedImports/>
128-
</java>
129-
<pom>
130-
<includes>
131-
<include>**/pom.xml</include>
132-
</includes>
133-
<excludes>
134-
<exclude>**/target/**/*.xml</exclude>
135-
</excludes>
136-
<sortPom>
137-
<expandEmptyElements>false</expandEmptyElements>
138-
<sortModules>true</sortModules>
139-
<sortDependencies>scope,groupId,artifactId</sortDependencies>
140-
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
141-
<sortPlugins>groupId,artifactId</sortPlugins>
142-
</sortPom>
143-
</pom>
144-
</configuration>
145-
<executions>
146-
<execution>
147-
<id>format</id>
148-
<goals>
149-
<goal>check</goal>
150-
</goals>
151-
<phase>process-sources</phase>
152-
</execution>
153-
</executions>
154-
</plugin>
76+
<googleJavaFormat>
77+
<version>1.18.1</version>
78+
<style>AOSP</style>
79+
<reflowLongStrings>true</reflowLongStrings>
80+
<formatJavadoc>false</formatJavadoc>
81+
</googleJavaFormat>
82+
<importOrder/>
83+
<replaceRegex>
84+
<name>Remove wildcard imports</name>
85+
<searchRegex>import\s+(?:static\s+)?[^\*\s]+\*;(\r\n|\r|\n)</searchRegex>
86+
<replacement>$1</replacement>
87+
</replaceRegex>
88+
<removeUnusedImports/>
89+
</java>
90+
<pom>
91+
<includes>
92+
<include>**/pom.xml</include>
93+
</includes>
94+
<excludes>
95+
<exclude>**/target/**/*.xml</exclude>
96+
</excludes>
97+
<sortPom>
98+
<expandEmptyElements>false</expandEmptyElements>
99+
<sortModules>true</sortModules>
100+
<sortDependencies>scope,groupId,artifactId</sortDependencies>
101+
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
102+
<sortPlugins>groupId,artifactId</sortPlugins>
103+
</sortPom>
104+
</pom>
105+
</configuration>
106+
</plugin>
155107

156-
<plugin>
157-
<groupId>org.apache.maven.plugins</groupId>
158-
<artifactId>maven-checkstyle-plugin</artifactId>
159-
<version>${maven-checkstyle-plugin.version}</version>
160-
<configuration>
161-
<failOnViolation>true</failOnViolation>
162-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
163-
<excludeGeneratedSources>true</excludeGeneratedSources>
164-
<checkstyleRules>
165-
<module name="Checker">
166-
<module name="FileTabCharacter">
167-
<property name="fileExtensions" value="java,xml"/>
168-
</module>
169-
<module name="SuppressWarningsFilter"/>
170-
<module name="TreeWalker">
171-
<module name="AnnotationUseStyle"/>
172-
<module name="ArrayTypeStyle"/>
173-
<module name="AtclauseOrder"/>
174-
<module name="AvoidDoubleBraceInitialization"/>
175-
<module name="AvoidNoArgumentSuperConstructorCall"/>
176-
<module name="ConstructorsDeclarationGrouping"/>
177-
<module name="DefaultComesLast"/>
178-
<module name="EmptyBlock">
179-
<property name="option" value="text"/>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-checkstyle-plugin</artifactId>
111+
<version>${maven-checkstyle-plugin.version}</version>
112+
<configuration>
113+
<failOnViolation>true</failOnViolation>
114+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
115+
<excludeGeneratedSources>true</excludeGeneratedSources>
116+
<checkstyleRules>
117+
<module name="Checker">
118+
<module name="FileTabCharacter">
119+
<property name="fileExtensions" value="java,xml"/>
180120
</module>
181-
<module name="EmptyCatchBlock"/>
182-
<module name="ExplicitInitialization"/>
183-
<module name="FallThrough"/>
184-
<module name="FinalClass"/>
185-
<module name="HideUtilityClassConstructor"/>
186-
<module name="IllegalCatch">
187-
<property name="illegalClassNames" value="Exception"/>
121+
<module name="SuppressWarningsFilter"/>
122+
<module name="TreeWalker">
123+
<module name="AnnotationUseStyle"/>
124+
<module name="ArrayTypeStyle"/>
125+
<module name="AtclauseOrder"/>
126+
<module name="AvoidDoubleBraceInitialization"/>
127+
<module name="AvoidNoArgumentSuperConstructorCall"/>
128+
<module name="ConstructorsDeclarationGrouping"/>
129+
<module name="DefaultComesLast"/>
130+
<module name="EmptyBlock">
131+
<property name="option" value="text"/>
132+
</module>
133+
<module name="EmptyCatchBlock"/>
134+
<module name="ExplicitInitialization"/>
135+
<module name="FallThrough"/>
136+
<module name="FinalClass"/>
137+
<module name="HideUtilityClassConstructor"/>
138+
<module name="IllegalCatch">
139+
<property name="illegalClassNames" value="Exception"/>
140+
</module>
141+
<module name="InnerAssignment"/>
142+
<module name="InvalidJavadocPosition"/>
143+
<module name="JavadocBlockTagLocation"/>
144+
<module name="JavadocContentLocation"/>
145+
<module name="JavadocMissingLeadingAsterisk"/>
146+
<module name="JavadocMissingWhitespaceAfterAsterisk"/>
147+
<module name="JavadocTagContinuationIndentation"/>
148+
<module name="ModifiedControlVariable"/>
149+
<module name="ModifierOrder"/>
150+
<module name="MultipleVariableDeclarations"/>
151+
<module name="MutableException"/>
152+
<module name="NeedBraces"/>
153+
<module name="NoClone"/>
154+
<module name="NoFinalizer"/>
155+
<module name="NonEmptyAtclauseDescription"/>
156+
<module name="OneStatementPerLine"/>
157+
<module name="OneTopLevelClass"/>
158+
<module name="OverloadMethodsDeclarationOrder"/>
159+
<module name="PackageDeclaration"/>
160+
<module name="RequireEmptyLineBeforeBlockTagGroup"/>
161+
<module name="SimplifyBooleanExpression"/>
162+
<module name="SimplifyBooleanReturn"/>
163+
<module name="SingleLineJavadoc"/>
164+
<module name="StringLiteralEquality"/>
165+
<module name="SuppressWarningsHolder"/>
166+
<module name="TypeName"/>
167+
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
168+
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
169+
<module name="UnnecessarySemicolonInEnumeration"/>
170+
<module name="UnnecessarySemicolonInTryWithResources"/>
171+
<module name="UnusedLocalVariable"/>
172+
<module name="UpperEll"/>
188173
</module>
189-
<module name="InnerAssignment"/>
190-
<module name="InvalidJavadocPosition"/>
191-
<module name="JavadocBlockTagLocation"/>
192-
<module name="JavadocContentLocation"/>
193-
<module name="JavadocMissingLeadingAsterisk"/>
194-
<module name="JavadocMissingWhitespaceAfterAsterisk"/>
195-
<module name="JavadocTagContinuationIndentation"/>
196-
<module name="ModifiedControlVariable"/>
197-
<module name="ModifierOrder"/>
198-
<module name="MultipleVariableDeclarations"/>
199-
<module name="MutableException"/>
200-
<module name="NeedBraces"/>
201-
<module name="NoClone"/>
202-
<module name="NoFinalizer"/>
203-
<module name="NonEmptyAtclauseDescription"/>
204-
<module name="OneStatementPerLine"/>
205-
<module name="OneTopLevelClass"/>
206-
<module name="OverloadMethodsDeclarationOrder"/>
207-
<module name="PackageDeclaration"/>
208-
<module name="RequireEmptyLineBeforeBlockTagGroup"/>
209-
<module name="SimplifyBooleanExpression"/>
210-
<module name="SimplifyBooleanReturn"/>
211-
<module name="SingleLineJavadoc"/>
212-
<module name="StringLiteralEquality"/>
213-
<module name="SuppressWarningsHolder"/>
214-
<module name="TypeName"/>
215-
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
216-
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
217-
<module name="UnnecessarySemicolonInEnumeration"/>
218-
<module name="UnnecessarySemicolonInTryWithResources"/>
219-
<module name="UnusedLocalVariable"/>
220-
<module name="UpperEll"/>
221174
</module>
222-
</module>
223-
</checkstyleRules>
224-
</configuration>
225-
<dependencies>
226-
<dependency>
227-
<groupId>com.puppycrawl.tools</groupId>
228-
<artifactId>checkstyle</artifactId>
229-
<version>${checkstyle.version}</version>
230-
</dependency>
231-
</dependencies>
232-
<executions>
233-
<execution>
234-
<id>checkstyle</id>
235-
<goals>
236-
<goal>check</goal>
237-
</goals>
238-
<phase>validate</phase>
239-
</execution>
240-
</executions>
241-
</plugin>
242-
<plugin>
243-
<groupId>org.apache.maven.plugins</groupId>
244-
<artifactId>maven-compiler-plugin</artifactId>
245-
<version>${maven.compiler.version}</version>
246-
<configuration>
247-
<source>11</source>
248-
<target>11</target>
249-
<annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
250-
<annotationProcessorPaths>
251-
<path>
252-
<groupId>com.dylibso.chicory</groupId>
253-
<artifactId>host-module-processor-experimental</artifactId>
254-
<version>${chicory.version}</version>
255-
</path>
256-
</annotationProcessorPaths>
257-
</configuration>
258-
</plugin>
259-
</plugins>
175+
</checkstyleRules>
176+
</configuration>
177+
<dependencies>
178+
<dependency>
179+
<groupId>com.puppycrawl.tools</groupId>
180+
<artifactId>checkstyle</artifactId>
181+
<version>${checkstyle.version}</version>
182+
</dependency>
183+
</dependencies>
184+
</plugin>
185+
186+
<plugin>
187+
<groupId>org.apache.maven.plugins</groupId>
188+
<artifactId>maven-compiler-plugin</artifactId>
189+
<version>${maven.compiler.version}</version>
190+
<configuration>
191+
<source>11</source>
192+
<target>11</target>
193+
<annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
194+
</configuration>
195+
</plugin>
196+
</plugins>
197+
</pluginManagement>
260198
</build>
261199
</project>

0 commit comments

Comments
 (0)