replace jars with Maven dependencies

- replace mockito-core jar with dependency - remove byte-buddy jar - remove objenesis jar
vitruv-tools · Jul 12, 2023 · b4bb94a · b4bb94a
1 parent 6d6ab84
commit b4bb94a
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 5 deletions.
diff --git a/releng/tools.vitruv.parent/pom.xml b/releng/tools.vitruv.parent/pom.xml
@@ -53,6 +53,22 @@
 						</systemPropertyVariables>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.6.0</version>
+					<executions>
+						<execution>
+							<id>copy-dependencies</id>
+							<goals>
+								<goal>copy-dependencies</goal>
+							</goals>
+							<configuration>
+								<stripVersion>true</stripVersion>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>

diff --git a/tests/tools.vitruv.framework.views.tests/.classpath b/tests/tools.vitruv.framework.views.tests/.classpath
@@ -8,8 +8,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/mockito-core-4.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/byte-buddy-1.12.4.jar"/>
-	<classpathentry kind="lib" path="lib/objenesis-3.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.apache.log4j,
  org.eclipse.uml2.uml,
  org.hamcrest.core,
  edu.kit.ipd.sdq.commons.util.java
-Bundle-ClassPath: ., lib/byte-buddy-1.12.4.jar, lib/mockito-core-4.2.0.jar, lib/objenesis-3.2.jar
+Bundle-ClassPath: .,
+ target/dependency/mockito-core.jar
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: vitruv.tools
diff --git a/tests/tools.vitruv.framework.views.tests/build.properties b/tests/tools.vitruv.framework.views.tests/build.properties
@@ -1,6 +1,6 @@
 bin.includes = .,\
                META-INF/,\
-               lib/
+               target/dependency/
 source.. = src/,\
            xtend-gen
 output.. = target/classes/
diff --git a/tests/tools.vitruv.framework.views.tests/lib/byte-buddy-1.12.4.jar b/tests/tools.vitruv.framework.views.tests/lib/byte-buddy-1.12.4.jar
diff --git a/tests/tools.vitruv.framework.views.tests/lib/mockito-core-4.2.0.jar b/tests/tools.vitruv.framework.views.tests/lib/mockito-core-4.2.0.jar
diff --git a/tests/tools.vitruv.framework.views.tests/lib/objenesis-3.2.jar b/tests/tools.vitruv.framework.views.tests/lib/objenesis-3.2.jar
diff --git a/tests/tools.vitruv.framework.views.tests/pom.xml b/tests/tools.vitruv.framework.views.tests/pom.xml
@@ -12,10 +12,21 @@
   <name>[test-bundle] Vitruv Framwork Views Tests</name>
 
   <dependencies>
+    <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <version>4.2.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>