Skip to content

Commit a18314f

Browse files
committed
FELIX-6741-Upgrade-dependencies-for-maven-bundle-plugin
- Reset maven version to 3.3.9, as specified in bnd 7.1.0 changelog - Fix tests; add build timestamp greater than 1980 (required in new maven-archiver) - Fix tests; change bnd version
1 parent e0fa3d4 commit a18314f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

tools/maven-bundle-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@
199199
<dependency>
200200
<groupId>org.apache.maven</groupId>
201201
<artifactId>maven-core</artifactId>
202-
<version>3.9.9</version>
202+
<version>3.3.9</version>
203203
<scope>provided</scope>
204204
</dependency>
205205
<dependency>
206206
<groupId>org.apache.maven</groupId>
207207
<artifactId>maven-model</artifactId>
208-
<version>3.9.9</version>
208+
<version>3.3.9</version>
209209
<scope>provided</scope>
210210
</dependency>
211211
<dependency>

tools/maven-bundle-plugin/src/it/reproducible-manifest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ under the License.
2626
<!-- default packaging: jar -->
2727

2828
<properties>
29-
<project.build.outputTimestamp>1</project.build.outputTimestamp>
29+
<project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
3030
</properties>
3131

3232
<dependencies>

tools/maven-bundle-plugin/src/it/reproducible/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ under the License.
2525
<version>1-SNAPSHOT</version>
2626
<packaging>bundle</packaging>
2727
<properties>
28-
<project.build.outputTimestamp>1</project.build.outputTimestamp>
28+
<project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
2929
</properties>
3030
<dependencies>
3131
<dependency>

tools/maven-bundle-plugin/src/it/with-multi-release-jar/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ String manifest = new File( basedir, "target/classes/META-INF/MANIFEST.MF" ).tex
2020
assert !manifest.isEmpty()
2121

2222
manifest.eachLine() { line ->
23-
if (line.contains("Tool") && !line.contains("7.0.0")) {
23+
if (line.contains("Tool") && !line.contains("7.1.0")) {
2424
throw new Exception("Wrong bnd version used");
2525
}
2626
if (line.contains("Embedded-Artifacts") && !line.contains("jersey-server-3.1.7.jar")) {

0 commit comments

Comments
 (0)