Author: ssmiweve
Date: 2009-08-14 15:19:40 +0200 (Fri, 14 Aug 2009)
New Revision: 7271
Modified:
branches/2.18/core-api/pom.xml
branches/2.18/pom.xml
branches/2.18/war/pom.xml
Log:
moving to JBoss-5.1 and the jboss published artifacts
Modified: branches/2.18/core-api/pom.xml
===================================================================
--- branches/2.18/core-api/pom.xml 2009-08-14 13:18:37 UTC (rev 7270)
+++ branches/2.18/core-api/pom.xml 2009-08-14 13:19:40 UTC (rev 7271)
@@ -174,37 +174,20 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+
+ <!-- EJB3 client -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
<type>jar</type>
- <version>4.0.5</version>
+ <version>3.0.0.CR1</version>
</dependency>
-
- <!--
- Need to use the same version as on server cause of this bug:
- https://jira.jboss.org/jira/browse/EJBTHREE-749
- -->
<dependency>
- <groupId>org.jboss</groupId>
- <!-- artifactId>jboss-ejb3-client</artifactId -->
- <artifactId>jboss-ejb3</artifactId>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
<type>jar</type>
- <version>4.0.5</version>
+ <version>2.4.0.CR2</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-aspect-jdk50-client</artifactId>
- <type>jar</type>
- <version>4.0.5</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- <type>jar</type>
- <version>4.0.5</version>
- </dependency>
<!-- Testin -->
<dependency>
Modified: branches/2.18/pom.xml
===================================================================
--- branches/2.18/pom.xml 2009-08-14 13:18:37 UTC (rev 7270)
+++ branches/2.18/pom.xml 2009-08-14 13:19:40 UTC (rev 7271)
@@ -958,6 +958,23 @@
<artifactId>newsadmin-services</artifactId>
<version>1.5</version>
<type>ejb-client</type>
+ <!-- news commands are meant more as an example within
sesat-kernel. don't go importing transitive dependencies. especially these
outdated artifacts.
+ - If you want to use news-admin-services you need to provide
the ejb3 remoting libraries yourself (eg from
http://repository.jboss.org/maven2 )
+ - or run Sesat-Kernel in a EJB3 container like JBoss-5 -->
+ <exclusions>
+ <exclusion>
+ <artifactId>jbossall-client</artifactId>
+ <groupId>org.jboss</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-aop-jdk50-client</artifactId>
+ <groupId>org.jboss</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-aspect-jdk50-client</artifactId>
+ <groupId>org.jboss</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -983,27 +1000,15 @@
<version>2.2.3</version>
<classifier>jdk15</classifier>
</dependency>
- <!-- old duplicate jboss ejb3 client libraries that get sucked in
transitively @todo fix + remove -->
- <dependency>
- <groupId>jboss-client</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <version>4.0.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jboss-client</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <version>4.0.5</version>
- <scope>provided</scope>
- </dependency>
+
+ <!-- EJB3 client -->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <type>jar</type>
+ <version>3.0.0.CR1</version>
+ </dependency>
- <dependency>
- <groupId>jboss-client</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <version>4.0.5</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
<dependencies>
@@ -1042,7 +1047,16 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <!-- TODO move up when we replace org.jboss:jbossall-client with
org.jboss.remoting:jboss-remoting -->
<repository>
+ <id>jboss</id>
+ <name>JBoss Repository for Maven2</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<!-- Troublesome repository! Comment out locally if it hangs as it
often does -->
<id>ibiblio</id>
<name>Ibiblio</name>
Modified: branches/2.18/war/pom.xml
===================================================================
--- branches/2.18/war/pom.xml 2009-08-14 13:18:37 UTC (rev 7270)
+++ branches/2.18/war/pom.xml 2009-08-14 13:19:40 UTC (rev 7271)
@@ -198,41 +198,20 @@
<groupId>sesat</groupId>
<artifactId>sesat-user-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossall-client</artifactId>
- <type>jar</type>
- <version>4.0.5</version>
- </dependency>
- <!--
- Need to use the same version as on server cause of this bug:
- https://jira.jboss.org/jira/browse/EJBTHREE-749
- -->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <type>jar</type>
+ </dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <!-- artifactId>jboss-ejb3-client</artifactId -->
- <artifactId>jboss-ejb3</artifactId>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
<type>jar</type>
- <version>4.0.5</version>
+ <version>2.4.0.CR2</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-aspect-jdk50-client</artifactId>
- <type>jar</type>
- <version>4.0.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- <type>jar</type>
- <version>4.0.5</version>
- </dependency>
-
- <dependency>
<groupId>org.tuckey</groupId>
<artifactId>urlrewritefilter</artifactId>
<type>jar</type>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
