Skip to content
This repository has been archived by the owner on Apr 8, 2019. It is now read-only.

Commit

Permalink
- Cleaned-up dependencies a little. (cherry picked from commit 7486b4f)
Browse files Browse the repository at this point in the history
  • Loading branch information
@metacosm
metacosm committed Jun 25, 2012
1 parent c3bd263 commit c0d8b28
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 85 deletions.
24 changes: 20 additions & 4 deletions pom.xml
View file
Expand Up @@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -52,6 +53,22 @@
<url>https://github.com/gatein/gatein-wsrp</url>
</scm>

<repositories>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>

<properties>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
Expand All @@ -65,17 +82,16 @@
<org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.version>
<org.mockito.version>1.8.5</org.mockito.version>
<org.jboss.portletbridge.version>2.3.0.Final</org.jboss.portletbridge.version>

<!-- maven-release-plugin -->
<useReleaseProfile>false</useReleaseProfile>
<arguments>-Prelease</arguments>
<version.release.plugin>2.2.1</version.release.plugin>
<pushChanges>false</pushChanges>
<autoVersionSubmodules>true</autoVersionSubmodules>

<!-- buildnumber-maven-plugin : needs 1.0 for git -->
<version.buildnumber.plugin>1.0</version.buildnumber.plugin>

</properties>

<organization>
Expand Down
36 changes: 23 additions & 13 deletions ws-security/jboss5/pom.xml
View file
Expand Up @@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
Expand Down Expand Up @@ -70,6 +71,11 @@
<artifactId>pc-federation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- <dependency>
<groupId>org.jboss.ws</groupId>
Expand All @@ -88,18 +94,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>2.0.3.SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<version>2.1.3.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
Expand Down Expand Up @@ -138,6 +132,22 @@
<groupId>jpl-pattern</groupId>
<artifactId>jpl-pattern</artifactId>
</exclusion>
<exclusion>
<groupId>apache-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<artifactId>javax.transaction</artifactId>
<groupId>jta</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
71 changes: 4 additions & 67 deletions ws-security/wss/pom.xml
View file
Expand Up @@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
Expand Down Expand Up @@ -67,74 +68,10 @@
<scope>provided</scope>
</dependency>

<!-- <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<version>1.1.2.GA</version>
</dependency>-->
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-core</artifactId>
<version>3.1.2.GA</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>wscommons-policy</groupId>
<artifactId>policy</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>2.0.3.SP1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
<version>2.1.3.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
<version>5.1.0.GA</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>trove</groupId>
<artifactId>trove</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-as-ejb3</artifactId>
</exclusion>
<exclusion>
<groupId>javax.security</groupId>
<artifactId>jaas</artifactId>
</exclusion>
<exclusion>
<groupId>javax.security</groupId>
<artifactId>jacc</artifactId>
</exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
<exclusion>
<groupId>jpl-util</groupId>
<artifactId>jpl-util</artifactId>
</exclusion>
<exclusion>
<groupId>jpl-pattern</groupId>
<artifactId>jpl-pattern</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
19 changes: 18 additions & 1 deletion wsrp-producer-war/pom.xml
View file
Expand Up @@ -22,7 +22,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
Expand Down Expand Up @@ -399,6 +400,22 @@
<groupId>jpl-pattern</groupId>
<artifactId>jpl-pattern</artifactId>
</exclusion>
<exclusion>
<groupId>apache-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<artifactId>javax.transaction</artifactId>
<groupId>jta</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down

0 comments on commit c0d8b28

Please sign in to comment.