Skip to content

Commit

Permalink
Merge pull request #77 from Yuan-Hu/NTA-70
Browse files Browse the repository at this point in the history 
NTA-70:Move all version numbers into root pom and update the versions
  • Loading branch information
@zhfeng
zhfeng committed Apr 26, 2016
2 parents e13c25b + 07da62c commit 04e2849
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 88 deletions.
37 changes: 5 additions & 32 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,10 @@
</snapshotRepository>
</distributionManagement>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
<version>2.0.0-beta-1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-tools</artifactId>
<version>1.0.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api</artifactId>
<version>2.0.0-beta-1</version>
<scope>test</scope>
</dependency>

Expand All @@ -93,34 +72,31 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<version>2.0.0-beta-1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
<version>2.0.0-beta-1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.5.6-Final</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>narayana-jta</artifactId>
<version>5.0.0.M2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
<scope>provided</scope>
<version>1.0.1.Final</version>
</dependency>

<dependency>
Expand All @@ -145,22 +121,19 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${basedir}/../etc/lib/commons-io-2.5-SNAPSHOT.jar</systemPath>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>1.0.3.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -179,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<version>${maven.plugins}</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -210,7 +183,7 @@
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>8.0.0.Final</version>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -233,7 +206,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>7.3.0.Final-redhat-SNAPSHOT</version>
<version>${jboos.as}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
13 changes: 0 additions & 13 deletions demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,6 @@
<description>A demo application that could fail transactions on demand</description>
<packaging>war</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>${version.jboss.spec.javaee.6.0}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
Expand Down Expand Up @@ -88,7 +76,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>

</dependencies>
Expand Down
1 change: 0 additions & 1 deletion nta-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
</description>
<packaging>ear</packaging>


<dependencies>
<dependency>
<groupId>io.narayana.nta</groupId>
Expand Down
1 change: 0 additions & 1 deletion nta-remote-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<groupId>io.narayana.nta</groupId>
<artifactId>core</artifactId>
<type>ejb</type>
<version>1.0.0.Alpha3-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
17 changes: 1 addition & 16 deletions plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,13 @@
<artifactId>plugins</artifactId>
<name>Narayana Transaction Analyser Plugin Module</name>

<dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>${version.jboss.spec.javaee.6.0}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>

</dependencyManagement>

<dependencies>

<dependency>
<groupId>io.narayana.nta</groupId>
<artifactId>core</artifactId>
<version>1.0.0.Alpha3-SNAPSHOT</version>
<scope>provided</scope>
<type>ejb</type>
</dependency>

<dependency>
Expand All @@ -72,7 +58,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>provided</scope>
</dependency>

Expand Down
131 changes: 123 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,24 +120,32 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.maven.surefire>2.15</version.maven.surefire>

<version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>

<version.jboss.spec.javaee.6.0>3.0.2.Final</version.jboss.spec.javaee.6.0>

<version.compiler.plugin>2.3.1</version.compiler.plugin>

<version.junit>4.8.1</version.junit>

<version.ear.plugin>2.6</version.ear.plugin>
<version.ejb.plugin>2.3</version.ejb.plugin>
<version.war.plugin>2.1.1</version.war.plugin>
<version.source.plugin>2.2.1</version.source.plugin>

<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.plugins>2.3.1</maven.plugins>
<version.jboss.shrinkwrap.resolver>2.0.0-beta-1</version.jboss.shrinkwrap.resolver>
<version.jboss.bom>1.0.0.Final</version.jboss.bom>
<version.hibernate>3.5.6-Final</version.hibernate>
<version.jboss.narayana.jta>5.0.0.M2</version.jboss.narayana.jta>
<version.jboss.spec.javax.transaction>1.0.1.Final</version.jboss.spec.javax.transaction>
<version.commons-io>2.5-SNAPSHOT</version.commons-io>
<version.log4j>1.2.17</version.log4j>
<version.jboss.arquillian.junit>1.0.3.Final</version.jboss.arquillian.junit>
<version.com.google.code.gson>2.2.4</version.com.google.code.gson>
<version.org.apache.myfaces.tomahawk>1.1.10</version.org.apache.myfaces.tomahawk>
<version.wildfly>8.0.0.Final</version.wildfly>
<version.io.narayana.nta>1.0.0.Alpha3-SNAPSHOT</version.io.narayana.nta>
<jboss.as>7.3.0.Final-redhat-SNAPSHOT</jboss.as>

</properties>

<dependencyManagement>
Expand All @@ -146,7 +154,7 @@
<groupId>io.narayana.nta</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<type>ejb</type>
<type>ejb</type>
</dependency>

<dependency>
Expand All @@ -171,6 +179,113 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
<version>${version.jboss.shrinkwrap.resolver}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-tools</artifactId>
<version>${version.jboss.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api</artifactId>
<version>${version.jboss.shrinkwrap.resolver}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<version>${version.jboss.shrinkwrap.resolver}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
<version>${version.jboss.shrinkwrap.resolver}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>${version.hibernate}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>narayana-jta</artifactId>
<version>${version.jboss.narayana.jta}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
<scope>provided</scope>
<version>${version.jboss.spec.javax.transaction}</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${version.commons-io}</version>
<scope>system</scope>
<systemPath>${basedir}/../etc/lib/commons-io-2.5-SNAPSHOT.jar</systemPath>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${version.log4j}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>${version.jboss.arquillian.junit}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${version.com.google.code.gson}</version>
</dependency>

<dependency>
<groupId>io.narayana.nta</groupId>
<artifactId>plugins</artifactId>
<version>${version.io.narayana.nta}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk20</artifactId>
<version>${version.org.apache.myfaces.tomahawk}</version>
</dependency>

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>${version.wildfly}</version>
<scope>provided</scope>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
Loading

0 comments on commit 04e2849

Please sign in to comment.