Skip to content

Commit 820a560

Browse files
authored
Merge pull request #205 from oracle/fix-sidecar-build
Correct sidecar build with introduction of builder-helper-mojo depedency
2 parents e52f11b + 48fc6b7 commit 820a560

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARG MAVEN_OPTS
77

88
WORKDIR /project/
99
COPY pom.xml .
10+
COPY build-helper-mojo/pom.xml build-helper-mojo/
1011
COPY wls-exporter-core/pom.xml wls-exporter-core/
1112
COPY wls-exporter-sidecar/pom.xml wls-exporter-sidecar/
1213

@@ -19,6 +20,7 @@ ARG MAVEN_OPTS
1920
WORKDIR /project/
2021
COPY --from=m2repo /root/.m2 /root/.m2
2122
COPY pom.xml .
23+
COPY build-helper-mojo/ build-helper-mojo/
2224
COPY wls-exporter-core/ wls-exporter-core/
2325
COPY wls-exporter-sidecar/ wls-exporter-sidecar/
2426

build-helper-mojo/src/main/java/com/oracle/wls/buildhelper/FileCopyMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022 Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package com.oracle.wls.buildhelper;

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@
316316
<jdk>[11,)</jdk>
317317
</activation>
318318
<modules>
319+
<module>build-helper-mojo</module>
319320
<module>wls-exporter-sidecar</module>
320321
</modules>
321322
</profile>

0 commit comments

Comments
 (0)