You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/06/16 09:22:57 UTC
svn commit: r1798901 - in /myfaces/tobago/branches/tobago-2.0.x: ./
tobago-assembly/ tobago-example/ tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-test/ tobago-extension/tobago-sandbox/
tobago-extension/tobago-sandbox/src/mai...
Author: lofwyr
Date: Fri Jun 16 09:22:56 2017
New Revision: 1798901
URL: http://svn.apache.org/viewvc?rev=1798901&view=rev
Log:
TOBAGO-1756: Adding CVE check of OWASP to the release process (Tobago 2.x)
* updating and cleaning up some dependencies
Removed:
myfaces/tobago/branches/tobago-2.0.x/dependency-check-suppression.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/util/
Modified:
myfaces/tobago/branches/tobago-2.0.x/pom.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-assembly/pom.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-example/pom.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-test/pom.xml
myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/pom.xml
Modified: myfaces/tobago/branches/tobago-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/pom.xml Fri Jun 16 09:22:56 2017
@@ -390,10 +390,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <optional>true</optional>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -492,9 +491,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -549,13 +548,13 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -1009,12 +1008,18 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>1.3.4</version>
+ <version>1.4.5</version>
<configuration>
- <!-- TBD: check which score can be accepted -->
- <failBuildOnCVSS>1</failBuildOnCVSS>
- <suppressionFile>${tobago.basedir}/dependency-check-suppression.xml</suppressionFile>
+ <failBuildOnCVSS>0</failBuildOnCVSS>
+ <suppressionFile>tobago/dependency-check-suppression-for-tobago-2.0.xml</suppressionFile>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>checkstyle-rules</artifactId>
+ <version>${checkstyle-rules.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
@@ -1516,9 +1521,9 @@
<myfaces22.version>2.2.12</myfaces22.version>
<mojarra20.version>2.0.11-04</mojarra20.version>
<mojarra21.version>2.1.29-08</mojarra21.version>
- <mojarra22.version>2.2.13</mojarra22.version>
- <slf4j.version>1.7.7</slf4j.version>
- <logback.version>1.1.1</logback.version>
+ <mojarra22.version>2.2.14</mojarra22.version>
+ <slf4j.version>1.7.22</slf4j.version>
+ <logback.version>1.2.3</logback.version>
<log4j.version>1.2.17</log4j.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
@@ -1530,6 +1535,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
+ <checkstyle-rules.version>7</checkstyle-rules.version>
+ <!-- TODO: change to 8 after it is released -->
+ <!--<checkstyle-rules.version>8-SNAPSHOT</checkstyle-rules.version>-->
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
</project>
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-assembly/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-assembly/pom.xml Fri Jun 16 09:22:56 2017
@@ -94,8 +94,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-example/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-example/pom.xml Fri Jun 16 09:22:56 2017
@@ -103,7 +103,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-b04</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-addressbook/pom.xml Fri Jun 16 09:22:56 2017
@@ -234,7 +234,7 @@
<properties>
<openjpa.version>1.2.3</openjpa.version>
- <spring.version>3.2.16.RELEASE</spring.version>
+ <spring.version>4.3.9.RELEASE</spring.version>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
</properties>
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-test/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-example/tobago-example-test/pom.xml Fri Jun 16 09:22:56 2017
@@ -148,17 +148,17 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gui-util</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/pom.xml?rev=1798901&r1=1798900&r2=1798901&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-extension/tobago-sandbox/pom.xml Fri Jun 16 09:22:56 2017
@@ -235,22 +235,6 @@
<artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <!-- XXX not transitive from fop -->
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.5</version>
- <!-- XXX wrong date -->
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</dependency>