third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#2468 Update needed dependencies for running CDI tests on Java 16+

Browse Source
This commit is contained in:
Filip Hrisafov 2022-01-23 21:12:30 +01:00
parent 20ff51ebb8
commit aade31f095
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java
View File

@ -5,7 +5,6 @@
*/ */
package org.mapstruct.itest.tests; package org.mapstruct.itest.tests;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.Execution;
@ -26,7 +25,6 @@ public class MavenIntegrationTest {
} }
@ProcessorTest(baseDir = "cdiTest") @ProcessorTest(baseDir = "cdiTest")
@DisabledForJreRange(min = JRE.JAVA_16)
void cdiTest() { void cdiTest() {
} }

2
integrationtest/src/test/resources/cdiTest/pom.xml
View File

@ -56,7 +56,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.weld</groupId> <groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId> <artifactId>weld-core-impl</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
integrationtest/src/test/resources/cdiTest/src/test/java/org/mapstruct/itest/cdi/CdiBasedMapperTest.java
View File

@ -38,7 +38,9 @@ public class CdiBasedMapperTest {
.addPackage( SourceTargetMapper.class.getPackage() ) .addPackage( SourceTargetMapper.class.getPackage() )
.addPackage( DateMapper.class.getPackage() ) .addPackage( DateMapper.class.getPackage() )
.addAsManifestResource( .addAsManifestResource(
new StringAsset("<decorators><class>org.mapstruct.itest.cdi.SourceTargetMapperDecorator</class></decorators>"), new StringAsset("<beans version=\"1.1\">" +
"<decorators><class>org.mapstruct.itest.cdi.SourceTargetMapperDecorator</class></decorators>" +
"</beans>"),
"beans.xml" ); "beans.xml" );
} }

11
parent/pom.xml
View File

@ -152,7 +152,7 @@
<dependency> <dependency>
<groupId>javax.enterprise</groupId> <groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId> <artifactId>cdi-api</artifactId>
<version>1.2</version> <version>2.0.SP1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
@ -162,19 +162,20 @@
<dependency> <dependency>
<groupId>org.jboss.arquillian</groupId> <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId> <artifactId>arquillian-bom</artifactId>
<version>1.0.2.Final</version> <version>1.6.0.Final</version>
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.arquillian.container</groupId> <groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-weld-se-embedded-1.1</artifactId> <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
<version>1.0.0.CR7</version> <version>1.0.0.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.weld</groupId> <groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId> <artifactId>weld-core-impl</artifactId>
<version>2.3.2.Final</version> <version>3.1.8.Final</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish</groupId> <groupId>org.glassfish</groupId>