Skip to content

Commit

Permalink
Flatten Maven project (#386)
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Jan 11, 2023
1 parent b2c7632 commit 8bdba69
Show file tree
Hide file tree
Showing 83 changed files with 253 additions and 381 deletions.
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ RUN git clone https://github.com/jenkinsci/plugin-compat-tester &&\
mvn clean package -Dmaven.test.skip=true dependency:go-offline && \
mvn clean

COPY plugins-compat-tester/ /pct/src/plugins-compat-tester/
COPY plugins-compat-tester-cli/ /pct/src/plugins-compat-tester-cli/
COPY plugins-compat-tester-model/ /pct/src/plugins-compat-tester-model/
COPY src/ /pct/src/src/
COPY *.xml /pct/src/
COPY LICENSE.txt /pct/src/LICENSE.txt

Expand Down Expand Up @@ -58,7 +56,7 @@ RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debia
RUN apt-get -y update && apt-get install -y docker-ce docker-ce-cli containerd.io

COPY src/main/docker/*.groovy /pct/scripts/
COPY --from=builder /pct/src/plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar /pct/pct-cli.jar
COPY --from=builder /pct/src/target/plugins-compat-tester-cli.jar /pct/pct-cli.jar
COPY src/main/docker/run-pct.sh /usr/local/bin/run-pct
COPY src/main/docker/pct-default-settings.xml /pct/default-m2-settings.xml

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ disabled_itBranches['CasC tests success'] = {
def settingsXML="mvn-settings.xml"
infra.retrieveMavenSettingsFile(settingsXML)

sh '''java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
sh '''java -jar target/plugins-compat-tester-cli.jar \
-reportFile $(pwd)/out/pct-report.xml \
-workDirectory $(pwd)/out/work \
-skipTestCache true \
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ allNoDocker: clean package
clean:
mvn clean

plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar:
target/plugins-compat-tester-cli.jar:
mvn package
.PHONY: package
package: plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar
package: target/plugins-compat-tester-cli.jar

.PHONY: docker
docker: Dockerfile
Expand All @@ -43,8 +43,8 @@ print-java-home:
echo "Using JAVA_HOME for tests $(TEST_JDK_HOME)"

.PHONY: demo-jdk8
demo-jdk8: plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar $(WAR_PATH) print-java-home
java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
demo-jdk8: target/plugins-compat-tester-cli.jar $(WAR_PATH) print-java-home
java -jar target/plugins-compat-tester-cli.jar \
-reportFile $(CURDIR)/out/pct-report.xml \
-failOnError \
-workDirectory $(CURDIR)/work \
Expand All @@ -56,8 +56,8 @@ demo-jdk8: plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar $(WAR_
$(EXTRA_OPTS)

.PHONY: demo-jdk11
demo-jdk11: plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar $(WAR_PATH) print-java-home
java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
demo-jdk11: target/plugins-compat-tester-cli.jar $(WAR_PATH) print-java-home
java -jar target/plugins-compat-tester-cli.jar \
-reportFile $(CURDIR)/out/pct-report.xml \
-failOnError \
-workDirectory $(CURDIR)/work \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ PCT offers the CLI interface which can be used to run PCT locally.
* Go to `PCT` folder and run the CLI (make sure to modify paths according to your system). Example:

```shell
java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
java -jar target/plugins-compat-tester-cli.jar \
-reportFile $(pwd)/out/report.xml \
-workDirectory $(pwd)/tmp/work \
-includePlugins ${PLUGIN_ARTIFACT_ID} \
Expand All @@ -115,7 +115,7 @@ You can run the CLI with the `-help` argument to get a full list of supported op
Plugin Compat Tester supports running test suites using a BOM file as source of truth as follows:

```shell
java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
java -jar target/plugins-compat-tester-cli.jar \
-reportFile $(pwd)/out/report.xml \
-workDirectory $(pwd)/tmp/work \
-includePlugins ${PLUGIN_ARTIFACT_ID} \
Expand Down Expand Up @@ -163,7 +163,7 @@ The format of the value **must** be `PLUGIN_GROUP:PLUGIN_NAME=PLUGIN_VERSION`.
So, running

```
java -jar plugins-compat-tester-cli/target/plugins-compat-tester-cli.jar \
java -jar target/plugins-compat-tester-cli.jar \
[...]
-overridenPlugins org.jenkins-ci.plugins:display-url-api=2.3.0
-includePlugins mailer
Expand Down
102 changes: 0 additions & 102 deletions plugins-compat-tester-cli/pom.xml

This file was deleted.

57 changes: 0 additions & 57 deletions plugins-compat-tester-model/pom.xml

This file was deleted.

0 comments on commit 8bdba69

Please sign in to comment.