143 lines
4.8 KiB
Diff
143 lines
4.8 KiB
Diff
|
From eed86a7fefb12f21a9076293dccb1a3c84e051fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mat Booth <mat.booth@redhat.com>
|
||
|
|
Date: Fri, 21 Feb 2020 10:08:13 +0000
|
||
|
|
Subject: [PATCH 6/8] Mockito does not have test scope
|
||
|
|
|
||
|
|
Change-Id: Ia0554670d27f1f05dc0d5c72f9afbbbc32e7fdbb
|
||
|
|
Signed-off-by: Mat Booth <mat.booth@redhat.com>
|
||
|
|
---
|
||
|
|
tycho-artifactcomparator/pom.xml | 5 +++--
|
||
|
|
tycho-core/pom.xml | 3 ++-
|
||
|
|
tycho-extras/tycho-eclipserun-plugin/pom.xml | 5 ++++-
|
||
|
|
tycho-extras/tycho-pomless/pom.xml | 5 +++--
|
||
|
|
tycho-surefire/tycho-surefire-plugin/pom.xml | 4 +++-
|
||
|
|
5 files changed, 15 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
|
||
|
|
index 9039f06..b2ee58a 100644
|
||
|
|
--- a/tycho-artifactcomparator/pom.xml
|
||
|
|
+++ b/tycho-artifactcomparator/pom.xml
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
|
<!--
|
||
|
|
- - Copyright (c) 2012 Sonatype Inc. and others.
|
||
|
|
+ - Copyright (c) 2012, 2020 Sonatype Inc. 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
|
||
|
|
@@ -49,6 +49,7 @@
|
||
|
|
<dependency>
|
||
|
|
<artifactId>junit</artifactId>
|
||
|
|
<groupId>junit</groupId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.eclipse.sisu</groupId>
|
||
|
|
@@ -68,4 +69,4 @@
|
||
|
|
</plugin>
|
||
|
|
</plugins>
|
||
|
|
</build>
|
||
|
|
-</project>
|
||
|
|
\ No newline at end of file
|
||
|
|
+</project>
|
||
|
|
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
|
||
|
|
index 9f2bf3b..bdd5a16 100644
|
||
|
|
--- a/tycho-core/pom.xml
|
||
|
|
+++ b/tycho-core/pom.xml
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
|
<!--
|
||
|
|
- - Copyright (c) 2008, 2011 Sonatype Inc. and others.
|
||
|
|
+ - Copyright (c) 2008, 2020 Sonatype Inc. 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
|
||
|
|
@@ -168,6 +168,7 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.mockito</groupId>
|
||
|
|
<artifactId>mockito-core</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
</dependencies>
|
||
|
|
|
||
|
|
diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
|
||
|
|
index ffb886b..beedebc 100644
|
||
|
|
--- a/tycho-extras/tycho-eclipserun-plugin/pom.xml
|
||
|
|
+++ b/tycho-extras/tycho-eclipserun-plugin/pom.xml
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
<!--
|
||
|
|
-- Copyright (c) 2011 Marc-Andre Laperle and others.
|
||
|
|
+- Copyright (c) 2011, 2020 Marc-Andre Laperle 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
|
||
|
|
@@ -42,14 +42,17 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>junit</groupId>
|
||
|
|
<artifactId>junit</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.eclipse.tycho</groupId>
|
||
|
|
<artifactId>tycho-testing-harness</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.mockito</groupId>
|
||
|
|
<artifactId>mockito-core</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
</dependencies>
|
||
|
|
<profiles>
|
||
|
|
diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
|
||
|
|
index 2584910..f2d7ffa 100644
|
||
|
|
--- a/tycho-extras/tycho-pomless/pom.xml
|
||
|
|
+++ b/tycho-extras/tycho-pomless/pom.xml
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
|
<!--
|
||
|
|
- - Copyright (c) 2015 SAP SE and others.
|
||
|
|
+ - Copyright (c) 2015, 2020 SAP SE 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
|
||
|
|
@@ -67,7 +67,8 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>junit</groupId>
|
||
|
|
<artifactId>junit</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
</dependencies>
|
||
|
|
|
||
|
|
-</project>
|
||
|
|
\ No newline at end of file
|
||
|
|
+</project>
|
||
|
|
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
|
||
|
|
index d03525a..5b2ac63 100644
|
||
|
|
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
|
||
|
|
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
|
<!--
|
||
|
|
- - Copyright (c) 2008, 2011 Sonatype Inc. and others.
|
||
|
|
+ - Copyright (c) 2008, 2020 Sonatype Inc. 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
|
||
|
|
@@ -162,10 +162,12 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.mockito</groupId>
|
||
|
|
<artifactId>mockito-core</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.eclipse.tycho</groupId>
|
||
|
|
<artifactId>tycho-testing-harness</artifactId>
|
||
|
|
+ <scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
</dependencies>
|
||
|
|
</project>
|
||
|
|
--
|
||
|
|
2.21.1
|
||
|
|
|