Skip to content

Commit 66f01c1

Browse files
authored
Merge pull request #233 from tls-attacker/fix/maven-submodule
fix: Allow TLS-Scanner project as submodule
2 parents f854be9 + bbcfe61 commit 66f01c1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

TLS-Server-Scanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<configuration>
3737
<filesets>
3838
<fileset>
39-
<directory>${main.basedir}/apps</directory>
39+
<directory>${maven.multiModuleProjectDirectory}/apps</directory>
4040
</fileset>
4141
</filesets>
4242
</configuration>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<destFileName>${project.build.finalName}.${project.packaging}</destFileName>
159159
</artifactItem>
160160
</artifactItems>
161-
<outputDirectory>${main.basedir}/apps</outputDirectory>
161+
<outputDirectory>${maven.multiModuleProjectDirectory}/apps</outputDirectory>
162162
</configuration>
163163
</execution>
164164
<execution>
@@ -168,7 +168,7 @@
168168
<goal>copy-dependencies</goal>
169169
</goals>
170170
<configuration>
171-
<outputDirectory>${main.basedir}/apps/lib</outputDirectory>
171+
<outputDirectory>${maven.multiModuleProjectDirectory}/apps/lib</outputDirectory>
172172
<!--Ensures only runnable dependencies are included-->
173173
<includeScope>compile</includeScope>
174174
</configuration>
@@ -180,7 +180,7 @@
180180
<artifactId>license-maven-plugin</artifactId>
181181
<version>4.1</version>
182182
<configuration>
183-
<header>license_header_plain.txt</header>
183+
<header>${main.basedir}/license_header_plain.txt</header>
184184
<strictCheck>true</strictCheck>
185185
<includes>
186186
<include>src/**/*.java</include>

0 commit comments

Comments
 (0)