dev/null |binary modules/core/gui/pom.xml | 2 -- modules/enterprise/gui/base-perspective-jar/pom.xml | 4 ---- modules/enterprise/gui/portal-war/pom.xml | 2 -- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/plugins/alert-operations/pom.xml | 1 - modules/enterprise/server/plugins/alert-roles/pom.xml | 1 - modules/enterprise/server/plugins/alert-subject/pom.xml | 1 - pom.xml | 13 ++++++++++++- 9 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 2011dbf8a871004140b2314005d87b7163f99e13 Author: Lukas Krejci lkrejci@redhat.com Date: Wed Dec 8 14:45:59 2010 +0100
BZ 659578 - Upgrade the Seam version to 2.2.1.CR2 to address the security vulnerability https://jira.jboss.org/browse/JBSEAM-4676. Also remove the custom SeamELResolver.class that contained a couple of fixes not present in 2.1.0.SP1.
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 561aa33..61d8a02 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -26,7 +26,6 @@
<!-- dependency versions --> <el.version>1.0</el.version> - <seam.version>2.1.0.SP1</seam.version> </properties>
<dependencies> @@ -158,7 +157,6 @@ <enabled>false</enabled> </snapshots> </repository> - </repositories>
<profiles> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 452af60..925cbfa 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -23,10 +23,6 @@ <properties> <jsf.version>1.2_14</jsf.version> <facelets.version>1.1.15.B1</facelets.version> - <!-- NOTE: Seam 2.1.2 and 2.2.0 can't be used in webapps deployed to the RHQ Server - due to https://jira.jboss.org/jira/browse/JBSEAM-4029. Seam 2.2.1 can be - used once it's released. --> - <seam.version>2.1.0.SP1</seam.version> <jboss-el.version>1.0_02.CR5</jboss-el.version> <richfaces.version>3.3.2.SR1</richfaces.version> </properties> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index c9eeee8..e42dbbe 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -26,7 +26,6 @@ <!-- dependency versions --> <el.version>1.0</el.version> <jsf-facelets.version>1.1.15.B1</jsf-facelets.version> - <seam.version>2.1.0.SP1</seam.version>
<!-- plugin versions --> <jetty-jspc-maven-plugin.version>7.0.1.v20091125</jetty-jspc-maven-plugin.version> @@ -594,7 +593,6 @@ <url>http://download.java.net/maven/1/</url> <layout>legacy</layout> </repository> - </repositories>
</project> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/org/jboss/seam/el/SeamELResolver.class b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/org/jboss/seam/el/SeamELResolver.class deleted file mode 100644 index 9cf7ddf..0000000 Binary files a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/org/jboss/seam/el/SeamELResolver.class and /dev/null differ diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 4c354bb..3e4fc5c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -25,7 +25,7 @@ <earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory>
<!-- dependency versions --> - <seam.version>1.2.1.GA</seam.version> + <!-- <seam.version>1.2.1.GA</seam.version> --> </properties>
<dependencies> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 65d296b..0b37848 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -19,7 +19,6 @@
<properties> <scm.module.path>modules/enterprise/server/plugins/alert-operations/</scm.module.path> - <seam.version>2.1.0.SP1</seam.version> </properties>
<dependencies> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 649554b..2bd8c5d 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -19,7 +19,6 @@
<properties> <scm.module.path>modules/enterprise/server/plugins/alert-roles/</scm.module.path> - <seam.version>2.1.0.SP1</seam.version> </properties>
<dependencies> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index ab235e2..3105b12 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -22,7 +22,6 @@
<properties> <scm.module.path>modules/enterprise/server/plugins/alert-subject/</scm.module.path> - <seam.version>2.1.0.SP1</seam.version> </properties>
<dependencies> diff --git a/pom.xml b/pom.xml index 7ae7f31..cb9a5fe 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,7 @@ <jaxb-impl.version>2.1.6</jaxb-impl.version> <jsf-api.version>1.2_14</jsf-api.version> <jsf-impl.version>1.2_14</jsf-impl.version> + <seam.version>2.2.1.CR2</seam.version> <ojdbc5.version>11.2.0.1.0</ojdbc5.version> <ems.version>1.2.15.1</ems.version> <postgresql.version>8.4-701.jdbc3</postgresql.version> @@ -417,7 +418,6 @@ <artifactId>jna</artifactId> <version>${jna.version}</version> </dependency> - </dependencies>
</dependencyManagement> @@ -822,6 +822,17 @@ </repository>
<repository> + <id>jboss-repository</id> + <name>JBoss</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url> + <!-- Explicitly disable snapshots, so Maven won't try to + check for updates for snapshot internal (rhq-*) deps. --> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> <id>jboss-thirdparty-uploads</id> <name>JBoss Third-Party Uploads</name> <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
rhq-commits@lists.fedorahosted.org