Skip to content

Commit 5e2ccad

Browse files
committed
Update to plexus-archiver to 4.2.7
Dummy pom.xml file is needed for invoker to start but it overrides it with content of zip file. Due to codehaus-plexus/plexus-archiver#128 archiver never overrides it as it has newer mdate than what's in archive. Delete manually before extracting.
1 parent da128d4 commit 5e2ccad

File tree

7 files changed

+8
-2
lines changed

7 files changed

+8
-2
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
- Copyright (c) 2008, 2020 Sonatype Inc. and others.
3+
- Copyright (c) 2008, 2022 Sonatype Inc. and others.
44
- All rights reserved. This program and the accompanying materials
55
- are made available under the terms of the Eclipse Public License v1.0
66
- which accompanies this distribution, and is available at
@@ -173,7 +173,7 @@
173173
<dependency>
174174
<groupId>org.codehaus.plexus</groupId>
175175
<artifactId>plexus-archiver</artifactId>
176-
<version>4.2.2</version>
176+
<version>4.2.7</version>
177177
</dependency>
178178
<dependency>
179179
<groupId>org.codehaus.plexus</groupId>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "basic.zip"), basedir);
45

56
return true;

tycho-extras/tycho-buildtimestamp-jgit/src/it/dirtySubmodules/prebuild.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "dirtySubmodules.zip"), basedir);
45

56
// this will cause the build to fail due to dirty working tree

tycho-extras/tycho-buildtimestamp-jgit/src/it/dirtyUnrelatedSubmodules/prebuild.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "dirtyUnrelatedSubmodules.zip"), basedir);
45

56
// this will cause a dirty unrelated submodule "unrelatedSubmodule"

tycho-extras/tycho-buildtimestamp-jgit/src/it/dirtyWorkingTreeWarningOnly/prebuild.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "basic.zip"), basedir);
45

56
// this will cause a warning and fallback to default timestamp provider due to dirty working tree

tycho-extras/tycho-buildtimestamp-jgit/src/it/dirtyworkingtree/prebuild.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "basic.zip"), basedir);
45

56
// this will cause the build to fail due to dirty working tree
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.io.File;
22

3+
new File(basedir, "pom.xml").delete();
34
org.eclipse.tycho.extras.buildtimestamp.jgit.test.UnzipFile.unzip(new File(basedir, "submodules.zip"), basedir);
45

56
return true;

0 commit comments

Comments
 (0)