|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
From 85a2495116da48f4a4328a9066a7147c9e363b70 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
From: Mat Booth <mat.booth@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Date: Wed, 11 Nov 2020 10:04:50 +0000
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ddccb33 |
Subject: [PATCH 8/9] Bug 561832 - Upgrade to [takari/polyglot-maven] Release
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
0.4.5
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
---
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
tycho-extras/tycho-pomless/pom.xml | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../tycho/pomless/AbstractTychoMapping.java | 3 ++
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../pomless/AbstractXMLTychoMapping.java | 5 +--
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../tycho/pomless/TychoAggregatorMapping.java | 6 +--
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../tycho/pomless/TychoBundleMapping.java | 40 ++++++++-----------
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../tycho/pomless/TychoMappingTest.java | 5 ++-
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
.../tycho/pomless/TychoModelReaderTest.java | 27 +++++++------
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
7 files changed, 39 insertions(+), 49 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index b1979ff..2ab14a8 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -47,7 +47,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
<dependency>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
<groupId>io.takari.polyglot</groupId>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
<artifactId>polyglot-common</artifactId>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- <version>0.4.4</version>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ <version>0.4.5</version>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
</dependency>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
<dependency>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
<groupId>org.eclipse.sisu</groupId>
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index d6a9977..b80c22b 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -114,6 +114,9 @@ public abstract class AbstractTychoMapping implements Mapping, ModelReader {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public Model read(File input, Map<String, ?> options) throws IOException, ModelParseException {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File artifactFile = getRealArtifactFile(input);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
if (artifactFile.exists()) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ if (artifactFile.isDirectory()) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return read(new StringReader(""), input, options);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
try (InputStreamReader stream = new InputStreamReader(new FileInputStream(artifactFile),
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
getPrimaryArtifactCharset())) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
return read(stream, input, options);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index 955b78a..05505d1 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -85,9 +85,6 @@ public abstract class AbstractXMLTychoMapping extends AbstractTychoMapping {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Override
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public float getPriority() {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- //FIXME due to
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- // https://github.com/takari/polyglot-maven/issues/209
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- // we must use inverse logic and return lower values for higher priorities
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return -1;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return 1;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index 8043dfe..39183d7 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -110,11 +110,7 @@ public class TychoAggregatorMapping extends AbstractTychoMapping {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Override
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public float getPriority() {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- //use a lower priority here so other modules are asked first
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- //FIXME due to
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- // https://github.com/takari/polyglot-maven/issues/209
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- // we must use inverse logic and return lower values for higher priorities
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return 10f;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return -10f;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index d450750..0d7baeb 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -1,5 +1,5 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
/*******************************************************************************
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- * Copyright (c) 2019 Lablicate GmbH and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ * Copyright (c) 2019, 2020 Lablicate GmbH and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
*
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* All rights reserved. This program and the accompanying materials
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* are made available under the terms of the Eclipse Public License v1.0
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -29,30 +29,30 @@ import org.sonatype.maven.polyglot.mapping.Mapping;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Component(role = Mapping.class, hint = TychoBundleMapping.PACKAGING)
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public class TychoBundleMapping extends AbstractTychoMapping {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
-
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ public static final String META_INF_DIRECTORY = "META-INF";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ public static final String MANIFEST_MF = "MANIFEST.MF";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public static final String PACKAGING = "eclipse-plugin";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
private static final String PACKAGING_TEST = "eclipse-test-plugin";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- private static final String MANIFEST_MF = "META-INF/MANIFEST.MF";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- public static final String MANIFEST_MF_MARKER = ".META-INF_MANIFEST.MF";
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Override
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
protected boolean isValidLocation(String location) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return location.endsWith(MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File polyglotArtifactFile = new File(location);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ if (polyglotArtifactFile.isDirectory() && polyglotArtifactFile.getName().equals(META_INF_DIRECTORY)) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return new File(polyglotArtifactFile, MANIFEST_MF).exists();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return false;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Override
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
protected File getPrimaryArtifact(File dir) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File manifestFile = new File(dir, MANIFEST_MF);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- if (manifestFile.isFile()) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File markerFile = new File(dir, MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- try {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- markerFile.createNewFile();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- } catch (IOException e) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- throw new RuntimeException("can't create markerfile", e);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File metaInfDirectory = new File(dir, META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ if (metaInfDirectory.isDirectory()) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File manifestFile = new File(metaInfDirectory, MANIFEST_MF);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ if (manifestFile.isFile()) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ return metaInfDirectory;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- markerFile.deleteOnExit();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return markerFile;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
return null;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -66,7 +66,7 @@ public class TychoBundleMapping extends AbstractTychoMapping {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
protected void initModel(Model model, Reader artifactReader, File artifactFile)
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
throws ModelParseException, IOException {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File bundleRoot = artifactFile.getParentFile();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File manifestFile = new File(bundleRoot, MANIFEST_MF);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File manifestFile = new File(artifactFile, MANIFEST_MF);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Attributes manifestHeaders = readManifestHeaders(manifestFile);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
String bundleSymbolicName = getBundleSymbolicName(manifestHeaders, manifestFile);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
// groupId is inherited from parent pom
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -94,14 +94,6 @@ public class TychoBundleMapping extends AbstractTychoMapping {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- @Override
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- protected File getRealArtifactFile(File polyglotArtifactFile) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- if (polyglotArtifactFile.getName().equals(MANIFEST_MF_MARKER)) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return new File(polyglotArtifactFile.getParentFile(), MANIFEST_MF);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- }
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- return super.getRealArtifactFile(polyglotArtifactFile);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- }
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
-
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
private Attributes readManifestHeaders(File manifestFile) throws IOException {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Manifest manifest = new Manifest();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
try (FileInputStream stream = new FileInputStream(manifestFile)) {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index 910150c..641cec3 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -1,5 +1,5 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
/*******************************************************************************
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- * Copyright (c) 2015 SAP SE and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ * Copyright (c) 2015, 2020 SAP SE and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* All rights reserved. This program and the accompanying materials
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* are made available under the terms of the Eclipse Public License v1.0
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* which accompanies this distribution, and is available at
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -7,6 +7,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
*
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* Contributors:
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* SAP SE - initial API and implementation
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ * Christoph Läubrich - adjust to changed API
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
*******************************************************************************/
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
package org.eclipse.tycho.pomless;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -27,7 +28,7 @@ public class TychoMappingTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testLocateBuildProperties() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File pom = polyglotModelManager.locatePom(new File(getMappingTestDir(), "simple"));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertNotNull(pom);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- assertEquals(TychoBundleMapping.MANIFEST_MF_MARKER, pom.getName());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ assertEquals(TychoBundleMapping.META_INF_DIRECTORY, pom.getName());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testPriority() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
diff --git a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
index 134987f..67ba7c2 100644
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--- a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+++ b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -1,5 +1,5 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
/*******************************************************************************
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- * Copyright (c) 2015, 2019 SAP SE and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ * Copyright (c) 2015, 2020 SAP SE and others.
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* All rights reserved. This program and the accompanying materials
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* are made available under the terms of the Eclipse Public License v1.0
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* which accompanies this distribution, and is available at
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -7,6 +7,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
*
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* Contributors:
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
* SAP SE - initial API and implementation
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ * Christoph Läubrich - adjust to API
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
*******************************************************************************/
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
package org.eclipse.tycho.pomless;
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -36,7 +37,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testReadBundle() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File buildProperties = new File(getPolyglotTestDir(), "bundle1/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File buildProperties = new File(getPolyglotTestDir(), "bundle1/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("4.0.0", model.getModelVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -45,12 +46,12 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("0.1.0-SNAPSHOT", model.getVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("eclipse-plugin", model.getPackaging());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertParent(model.getParent());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ assertLocation("bundle1/META-INF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testReadBundle2() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File buildProperties = new File(getPolyglotTestDir(), "bundle2/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File buildProperties = new File(getPolyglotTestDir(), "bundle2/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("4.0.0", model.getModelVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -59,12 +60,12 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("0.1.0-SNAPSHOT", model.getVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("eclipse-plugin", model.getPackaging());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertParent(model.getParent());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- assertLocation("bundle2/META-INF/MANIFEST.MF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ assertLocation("bundle2/META-INF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testReadBundle3() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File buildProperties = new File(getPolyglotTestDir(), "bundle3/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File buildProperties = new File(getPolyglotTestDir(), "bundle3/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("4.0.0", model.getModelVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -73,19 +74,19 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("0.1.0-SNAPSHOT", model.getVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("eclipse-plugin", model.getPackaging());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertParent(model.getParent());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- assertLocation("bundle3/META-INF/MANIFEST.MF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ assertLocation("bundle3/META-INF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testReadTestBundle() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- File buildProperties = new File(getPolyglotTestDir(), "bundle1.tests/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ File buildProperties = new File(getPolyglotTestDir(), "bundle1.tests/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("pomless.bundle.tests", model.getArtifactId());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("1.0.1", model.getVersion());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertEquals("eclipse-test-plugin", model.getPackaging());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertParent(model.getParent());
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ assertLocation("bundle1.tests/META-INF", model.getLocation(""));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
}
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -158,7 +159,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testBundleWithoutSymbolicName() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File buildProperties = new File(getTestResourcesDir(),
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- "modelreader/plugins/missingBsn/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ "modelreader/plugins/missingBsn/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
try {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -171,7 +172,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testBundleWithoutVersion() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File buildProperties = new File(getTestResourcesDir(),
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- "modelreader/plugins/missingVersion/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ "modelreader/plugins/missingVersion/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
try {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -184,7 +185,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testNoParent() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File buildProperties = new File(getTestResourcesDir(),
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- "modelreader/noParent/bundle/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ "modelreader/noParent/bundle/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
FileNotFoundException e = assertThrows(FileNotFoundException.class,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
() -> getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
createReaderOptions(buildProperties)));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@@ -194,7 +195,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
@Test
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
public void testFindParent() throws Exception {
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
File location = new File(getTestResourcesDir(),
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
- "modelreader/grandparentInheritance/bundle/" + TychoBundleMapping.MANIFEST_MF_MARKER);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
+ "modelreader/grandparentInheritance/bundle/" + TychoBundleMapping.META_INF_DIRECTORY);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(location, createReaderOptions(location));
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
assertNotNull(model);
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
Parent parentReference = model.getParent();
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
--
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
2.28.0
|
|
![](https://seccdn.libravatar.org/avatar/60f3bc9cb3cb070fcee9701bf8296fd6eafd560b3f73fabcf4595090f407cc31?s=16&d=retro) |
ee37dbd |
|