Skip to content

Commit

Permalink
[JBWS-4152] Extract versions to properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbliznak @asoldano
jbliznak authored and asoldano committed Nov 21, 2018
1 parent 33005ed commit 7c159a2
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 15 deletions.
13 changes: 8 additions & 5 deletions modules/testsuite/perf-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
</parent>

<properties>
<jmeter.version>2.13</jmeter.version>
<jmeter.graph.plugin.version>0.1.0</jmeter.graph.plugin.version>
<jmeter.plugin.version>1.10.1</jmeter.plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -56,7 +59,7 @@
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_java</artifactId>
<version>2.13</version>
<version>${jmeter.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -336,7 +339,7 @@
<plugin>
<groupId>com.lazerycode.jmeter</groupId>
<artifactId>jmeter-maven-plugin</artifactId>
<version>1.10.1</version>
<version>${jmeter.plugin.version}</version>
<executions>
<execution>
<id>jmeter-tests</id>
Expand Down Expand Up @@ -413,7 +416,7 @@
<!-- TODO replace with a custom plugin allowing generating CSV reports too -->
<groupId>de.codecentric</groupId>
<artifactId>jmeter-graph-maven-plugin</artifactId>
<version>0.1.0</version>
<version>${jmeter.graph.plugin.version}</version>
<executions>
<execution>
<id>create-graphs</id>
Expand Down Expand Up @@ -489,7 +492,7 @@
<plugin>
<groupId>com.lazerycode.jmeter</groupId>
<artifactId>jmeter-maven-plugin</artifactId>
<version>1.10.1</version>
<version>${jmeter.plugin.version}</version>
<executions>
<execution>
<id>jmeter-tests</id>
Expand Down Expand Up @@ -566,7 +569,7 @@
<!-- TODO replace with a custom plugin allowing generating CSV reports too -->
<groupId>de.codecentric</groupId>
<artifactId>jmeter-graph-maven-plugin</artifactId>
<version>0.1.0</version>
<version>${jmeter.graph.plugin.version}</version>
<executions>
<execution>
<id>create-graphs</id>
Expand Down
3 changes: 2 additions & 1 deletion modules/testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<gnu.getopt.version>1.0.13</gnu.getopt.version>
<bc.version>1.60</bc.version>
<resources-plugin-filters.version>1.1.0.Final</resources-plugin-filters.version>
<exec.plugin.version>1.2.1</exec.plugin.version>
<port-offset.cxf-tests.jboss>0</port-offset.cxf-tests.jboss>
<port-offset.cxf-tests.ssl-mutual-auth>5000</port-offset.cxf-tests.ssl-mutual-auth>
<port-offset.cxf-tests.default-config-tests>10000</port-offset.cxf-tests.default-config-tests>
Expand Down Expand Up @@ -191,7 +192,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<version>${exec.plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down
27 changes: 18 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@
<jacc.api.version>1.0.2.Final</jacc.api.version>
<javax.inject.version>1</javax.inject.version>
<org.easymock.version>3.2</org.easymock.version>
<junit.version>4.12</junit.version>
<eclipse.plugin.version>1.0.0</eclipse.plugin.version>
<gmavenplus.version>1.5</gmavenplus.version>
<groovy.version>2.4.15</groovy.version>
<jdocbook.plugin.version>2.1.2</jdocbook.plugin.version>
<jdocbook.style.version>1.1.1</jdocbook.style.version>
<docbook.xslt.version>1.1.1</docbook.xslt.version>
<wildfly.plugin.version>1.0.2.Final</wildfly.plugin.version>
<wildfly.cli.version>8.2.1.Final</wildfly.cli.version>
<modular.jdk.args />
<modular.jdk.props />
</properties>
Expand Down Expand Up @@ -1272,7 +1281,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1320,25 +1329,25 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<version>${gmavenplus.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.15</version>
<version>${groovy.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<version>1.0.2.Final</version>
<version>${wildfly.plugin.version}</version>
<dependencies> <!-- workaround to exclude not needed jconsole from dependencies, as it hurts when running on JDK9 -->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-cli</artifactId>
<version>8.2.1.Final</version>
<version>${wildfly.cli.version}</version>
<exclusions>
<exclusion>
<groupId>sun.jdk</groupId>
Expand All @@ -1351,13 +1360,13 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.1.2</version>
<version>${jdocbook.plugin.version}</version>
<extensions>true</extensions>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
<version>1.1.1</version>
<version>${docbook.xslt.version}</version>
<!-- TODO workaround for https://issues.jboss.org/browse/PRESSGANG-60,
could be removed if new org.jboss.pressgang extensions are used instead -->
<exclusions>
Expand All @@ -1374,7 +1383,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
<version>1.1.1</version>
<version>${jdocbook.style.version}</version>
<type>jdocbook-style</type>
<!-- TODO workaround for https://issues.jboss.org/browse/PRESSGANG-60,
could be removed if new org.jboss.pressgang extensions are used instead -->
Expand Down Expand Up @@ -1572,7 +1581,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<version>${eclipse.plugin.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
Expand Down

0 comments on commit 7c159a2

Please sign in to comment.