Skip to content

Commit

Permalink
updated dependencies to the latest versions, updated plugins, (#63)
Browse files Browse the repository at this point in the history 
added commons-lang3 and made arquillian dependencies optional so they are not transitive
    for downstream applications
  • Loading branch information
@lprimak
lprimak authored Dec 1, 2020
1 parent c2d5532 commit 3ee673a
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 21 deletions.
76 changes: 58 additions & 18 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<artifactId>arquillian-suite-extension</artifactId>
<version>1.2.2-SNAPSHOT</version>
<packaging>jar</packaging>


<name>Arquillian suite extension</name>
<description>Arquillian extension that will force single deployment for all tests</description>
<url>https://github.com/ingwarsw/arquillian-suite-extension</url>

<inceptionYear>2013</inceptionYear>

<licenses>
Expand Down Expand Up @@ -60,12 +60,12 @@
<maven.compiler.source>1.6</maven.compiler.source>

<!-- Libraries versions -->
<version.arquillian_core>1.4.0.Final</version.arquillian_core>
<version.jacoco>0.7.4.201502262128</version.jacoco>
<version.arquillian_core>1.6.0.Final</version.arquillian_core>
<version.jacoco>0.8.6</version.jacoco>
<version.jbossas>7.5.7.Final-redhat-3</version.jbossas>
<version.glassfish>4.1.2</version.glassfish>
<version.wildfly>10.1.0.Final</version.wildfly>
<version.arquillian_wildfly>2.1.0.Final</version.arquillian_wildfly>
<version.arquillian_wildfly>3.0.1.Final</version.arquillian_wildfly>

<!-- Other props -->
<jbossHome>${project.build.directory}/jboss-as-${version.jbossas}</jbossHome>
Expand All @@ -83,11 +83,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>24.1.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -96,33 +91,44 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-impl-base</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
<optional>true</optional>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-impl-base</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.11</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -136,21 +142,35 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
</dependency>
</dependencies>

<build>
Expand All @@ -166,7 +186,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.2</version>
<executions>
<execution>
<id>unpack</id>
Expand Down Expand Up @@ -196,12 +216,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M5</version>
<configuration>
<environmentVariables>
<JBOSS_HOME>${jbossHome}</JBOSS_HOME>
Expand Down Expand Up @@ -236,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
<configuration>
<webappDirectory>${project.build.directory}/test-war-module</webappDirectory>
</configuration>
Expand All @@ -250,6 +270,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -267,7 +307,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -280,7 +320,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -512,7 +552,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.2.1</version>
<version>4.3.0</version>
<executions>
<execution>
<id>coveralls-jacoco</id>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/eu/ingwar/tools/arquillian/extension/suite/DeploymentClassFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* #L%
*/

import org.apache.commons.lang.StringUtils;
import org.eu.ingwar.tools.arquillian.extension.suite.annotations.ArquillianSuiteDeployment;
import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
import org.jboss.arquillian.config.descriptor.api.ExtensionDef;
Expand All @@ -30,6 +29,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang3.StringUtils;

class DeploymentClassFinder {
private static final Logger log = Logger.getLogger(DeploymentClassFinder.class.getName());
Expand All @@ -53,7 +53,7 @@ static Class<?> getDeploymentClass(ArquillianDescriptor descriptor) {

/**
* Finds class with should produce global deployment PER project.
*
*
* @param descriptor ArquillianDescriptor
* @return class marked witch @ArquillianSuiteDeployment annotation
*/
Expand Down Expand Up @@ -90,7 +90,7 @@ private static Class<?> getDeploymentClassFromAnnotation(ArquillianDescriptor de
log.log(Level.INFO,"arquillian-suite-deployment: Found class annotated with @ArquillianSuiteDeployment: {0}", type.getName());
return type;
}

/**
* Indicates if the deployment annotated class should be searched across the whole available classpath.
* Extension name used: suite
Expand Down

0 comments on commit 3ee673a

Please sign in to comment.