Permalink
Browse files

Fix issues with exclusions and repositories in poms

  • Loading branch information...
1 parent af960b6 commit 032120088fad41f95b6bb67281aad98c7f1ce422 @rstoyanchev rstoyanchev committed Feb 1, 2013
Showing with 46 additions and 81 deletions.
  1. +1 −30 booking-faces/pom.xml
  2. +0 −7 booking-portlet-faces/pom.xml
  3. +0 −7 booking-portlet-mvc/pom.xml
  4. +2 −0 pom.xml
  5. +24 −17 primefaces-showcase/pom.xml
  6. +19 −20 webflow-showcase/pom.xml
View
31 booking-faces/pom.xml
@@ -42,13 +42,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework-version}</version>
- <exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -74,33 +67,11 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${springsecurity-version}</version>
- <exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${springsecurity-version}</version>
- <exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Database, JPA -->
<dependency>
@@ -246,7 +217,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
View
7 booking-portlet-faces/pom.xml
@@ -29,13 +29,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework-version}</version>
- <exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
View
7 booking-portlet-mvc/pom.xml
@@ -28,13 +28,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework-version}</version>
- <exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
View
2 pom.xml
@@ -12,5 +12,7 @@
<module>booking-faces</module>
<module>booking-portlet-mvc</module>
<module>booking-portlet-faces</module>
+ <module>primefaces-showcase</module>
+ <module>webflow-showcase</module>
</modules>
</project>
View
41 primefaces-showcase/pom.xml
@@ -11,7 +11,7 @@
<properties>
<java-version>1.5</java-version>
<springframework-version>3.2.1.RELEASE</springframework-version>
- <springwebflow-version>2.4.0.BUILD-SNAPSHOT</springwebflow-version>
+ <springwebflow-version>2.4.0.M1</springwebflow-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
</properties>
@@ -20,14 +20,23 @@
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframework-version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
@@ -41,7 +50,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -52,7 +61,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -63,7 +72,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -164,30 +173,28 @@
</dependencies>
<repositories>
- <!-- For developing against latest Spring milestones -->
<repository>
<id>springsource</id>
<name>SpringSource Repository</name>
- <url>http://repo.springsource.org/release</url>
+ <url>http://repo.springsource.org/milestone</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
- <!-- Hibernate Validator -->
<repository>
<id>jboss</id>
- <name>JBoss Maven Release Repository</name>
+ <name>JBoss Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/releases</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>java.net</id>
- <name>Java.net Repository for Maven</name>
+ <name>Java.net Repository</name>
<url>http://download.java.net/maven/2/</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>primefaces</id>
- <name>Prime Technology Maven Repository</name>
+ <name>Prime Technology Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
@@ -206,7 +213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
View
39 webflow-showcase/pom.xml
@@ -20,14 +20,23 @@
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframework-version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -54,14 +63,9 @@
<artifactId>spring-security-web</artifactId>
<version>${springsecurity-version}</version>
<exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -72,7 +76,7 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -81,14 +85,9 @@
<artifactId>spring-security-config</artifactId>
<version>${springsecurity-version}</version>
<exclusions>
- <!-- Exclude Commons Logging in favor of SLF4j -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -244,7 +243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>

0 comments on commit 0321200

Please sign in to comment.