Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Import-Package instead of Require-Bundle for JUnit imports #580

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Use Import-Package instead of Require-Bundle for JUnit imports #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bundles/tools.vitruv.testutils.vsum/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
Expand Down
3 changes: 2 additions & 1 deletion bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ Bundle-Version: 3.0.1.qualifier
Bundle-Vendor: tools.vitruv
Automatic-Module-Name: tools.vitruv.testutils.vsum
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.extension
Require-Bundle: com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.junit.jupiter.api,
org.hamcrest.core,
tools.vitruv.testutils;visibility:=reexport,
tools.vitruv.framework.vsum;visibility:=reexport,
Expand Down
1 change: 0 additions & 1 deletion tests/tools.vitruv.framework.views.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<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"/>
Expand Down
7 changes: 5 additions & 2 deletions tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ Automatic-Module-Name: tools.vitruv.framework.views.tests
Bundle-Version: 3.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Fragment-Host: tools.vitruv.framework.views
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.extension,
org.junit.jupiter.api.function,
org.junit.jupiter.params,
org.junit.jupiter.params.provider
Require-Bundle: org.apache.log4j,
tools.vitruv.testutils.vsum,
tools.vitruv.testutils.metamodels,
org.eclipse.core.expressions,
org.eclipse.xtend.lib,
org.eclipse.uml2.uml,
org.junit.jupiter.api,
org.junit.jupiter.params,
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
Expand Down
1 change: 0 additions & 1 deletion tests/tools.vitruv.framework.vsum.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 2 additions & 1 deletion tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ Automatic-Module-Name: tools.vitruv.framework.vsum.tests
Bundle-Version: 3.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Fragment-Host: tools.vitruv.framework.vsum
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.extension
Require-Bundle: org.apache.log4j,
tools.vitruv.testutils.vsum,
tools.vitruv.testutils.metamodels,
org.eclipse.core.expressions,
org.eclipse.xtend.lib,
org.eclipse.uml2.uml,
org.junit.jupiter.api,
org.hamcrest.core,
edu.kit.ipd.sdq.commons.util.java,
edu.kit.ipd.sdq.commons.util.emf
Expand Down