cleanup dependencies
update some plugins
diff --git a/pom.xml b/pom.xml
index f3372e8..8363385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,70 +417,33 @@
<module>trinidad-impl</module>
<module>trinidad-example</module>
</modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
<build>
-
- <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-7</version>
- </extension>
- </extensions>
-
+
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.5.1</version>
<inherited>true</inherited>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-7</version>
- </dependency>
- </dependencies>
<configuration>
<stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
<stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
<outputEncoding>UTF-8</outputEncoding>
- <reportPlugins>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <threshold>Low</threshold>
- </configuration>
- </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
-
- <!--plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${jdk.version}</targetJdk>
- </configuration>
- </plugin -->
- </reportPlugins>
</configuration>
</plugin>
@@ -718,7 +681,7 @@
<headerLocation>default/myfaces-header.txt</headerLocation>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -758,7 +721,7 @@
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.5</version>
<executions>
<execution>
<goals>
@@ -766,7 +729,7 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
<properties>
<addLicense>true</addLicense>
@@ -780,7 +743,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <version>0.12</version>
<configuration>
<includes>
<include>src/*/</include>
@@ -945,6 +908,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
<executions>
<execution>
<phase>verify</phase>
diff --git a/trinidad-example/trinidad-components-showcase/pom.xml b/trinidad-example/trinidad-components-showcase/pom.xml
index b546efc..b1a8996 100644
--- a/trinidad-example/trinidad-components-showcase/pom.xml
+++ b/trinidad-example/trinidad-components-showcase/pom.xml
@@ -52,9 +52,9 @@
</dependency>
<dependency>
- <groupId>com.uwyn</groupId>
+ <groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
- <version>1.0</version>
+ <version>1.0.2</version>
</dependency>
</dependencies>
diff --git a/trinidad-example/trinidad-demo/pom.xml b/trinidad-example/trinidad-demo/pom.xml
index 4c2b1ac..1edca33 100644
--- a/trinidad-example/trinidad-demo/pom.xml
+++ b/trinidad-example/trinidad-demo/pom.xml
@@ -34,11 +34,11 @@
<packaging>war</packaging>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.slf4j</groupId>
@@ -53,19 +53,25 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_provider</artifactId>
+ <version>1.8.2</version>
</dependency>
-
+
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
