Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-05-03 04:40:19 -0400
committerAlexander Kurtakov2018-05-03 07:55:50 -0400
commit985e8fe24632507cdf7980c79eb10e0d4f0c18c1 (patch)
treecd5156d12f03ffb01d64b1a2dabee45c8f0ecf06
parent501906a8f4054d7bbf670e7bb4fa72b91d2b3e07 (diff)
downloadorg.eclipse.tycho.extras-985e8fe24632507cdf7980c79eb10e0d4f0c18c1.tar.gz
org.eclipse.tycho.extras-985e8fe24632507cdf7980c79eb10e0d4f0c18c1.tar.xz
org.eclipse.tycho.extras-985e8fe24632507cdf7980c79eb10e0d4f0c18c1.zip
Bug 534248: Update to latest maven-verifier
Unbreak tycho-extras as it inherits the maven-verifier change and thus needs similar changes. Change-Id: I8ff1401b1baf428c669e85182beb52b20d24eadb Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--tycho-extras-its/src/test/resources/testpomless/bundle1.tests/META-INF/MANIFEST.MF1
-rw-r--r--tycho-extras-its/src/test/resources/testpomless/bundle1/META-INF/MANIFEST.MF1
-rw-r--r--tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojoTest.java10
-rw-r--r--tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojoTest.java9
4 files changed, 11 insertions, 10 deletions
diff --git a/tycho-extras-its/src/test/resources/testpomless/bundle1.tests/META-INF/MANIFEST.MF b/tycho-extras-its/src/test/resources/testpomless/bundle1.tests/META-INF/MANIFEST.MF
index 1252600..6ffc116 100644
--- a/tycho-extras-its/src/test/resources/testpomless/bundle1.tests/META-INF/MANIFEST.MF
+++ b/tycho-extras-its/src/test/resources/testpomless/bundle1.tests/META-INF/MANIFEST.MF
@@ -3,3 +3,4 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: pomless.bundle.tests
Bundle-Version: 1.0.1
Require-Bundle: org.junit;bundle-version="4.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tycho-extras-its/src/test/resources/testpomless/bundle1/META-INF/MANIFEST.MF b/tycho-extras-its/src/test/resources/testpomless/bundle1/META-INF/MANIFEST.MF
index 390c98c..4ba703e 100644
--- a/tycho-extras-its/src/test/resources/testpomless/bundle1/META-INF/MANIFEST.MF
+++ b/tycho-extras-its/src/test/resources/testpomless/bundle1/META-INF/MANIFEST.MF
@@ -2,4 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: pomless.bundle;singleton:=true
Bundle-Version: 0.1.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojoTest.java b/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojoTest.java
index f1fdedc..7dced96 100644
--- a/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojoTest.java
+++ b/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojoTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 SAP AG and others.
+ * Copyright (c) 2010, 2018 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,19 +19,19 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import junit.framework.Assert;
-
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.it.util.IOUtil;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
import org.eclipse.core.runtime.adaptor.EclipseStarter;
import org.eclipse.tycho.testing.AbstractTychoMojoTestCase;
+import junit.framework.Assert;
+
public class MirrorMojoTest extends AbstractTychoMojoTestCase {
private File mirrorDestinationDir;
diff --git a/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojoTest.java b/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojoTest.java
index 15d3b70..907c435 100644
--- a/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojoTest.java
+++ b/tycho-p2-extras-plugin/src/test/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojoTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 SAP AG and others.
+ * Copyright (c) 2010, 2018 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,22 +17,21 @@ import java.net.URL;
import java.util.List;
import java.util.Properties;
-import junit.framework.Assert;
-
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.IOUtil;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
import org.eclipse.tycho.testing.AbstractTychoMojoTestCase;
import de.pdark.decentxml.Document;
import de.pdark.decentxml.Element;
import de.pdark.decentxml.XMLIOSource;
import de.pdark.decentxml.XMLParser;
+import junit.framework.Assert;
public class PublishFeaturesAndBundlesMojoTest extends AbstractTychoMojoTestCase {

Back to the top