Author: ate
Date: Mon Mar 7 22:55:55 2011
New Revision: 1079007
URL: http://svn.apache.org/viewvc?rev=1079007&view=rev
Log:
JS2-1245: Update some external artifact dependencies to more recent and general
available versions
See: https://issues.apache.org/jira/browse/JS2-1245
- package the com.google.step2 "fork" under folder openid-step2 as
org.apache.portals-jetspeed-2:com-google-step2-common:jar:0
and integrate in the build as a jetspeed-2 artifact we release ourselves
(requires us to use/repackage using a apache groupId)
Note: the com.google.step2 project hasn't put out any non-SNAPSHOT release so
far and our "fork" is based/pinned on a specific revision.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml
portals/jetspeed-2/portal/trunk/openid-step2/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=1079007&r1=1079006&r2=1079007&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Mon Mar
7 22:55:55 2011
@@ -189,8 +189,8 @@
<artifactId>openid4java-consumer</artifactId>
</dependency>
<dependency>
- <groupId>com.google.step2</groupId>
- <artifactId>step2-common</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>com-google-step2-common</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml?rev=1079007&r1=1079006&r2=1079007&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml Mon Mar 7
22:55:55 2011
@@ -23,13 +23,12 @@
<name>STEP2 Common</name>
<parent>
- <artifactId>step2-parent</artifactId>
- <groupId>com.google.step2</groupId>
+ <artifactId>com-google-step2-parent</artifactId>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<version>0</version>
</parent>
- <groupId>com.google.step2</groupId>
- <artifactId>step2-common</artifactId>
+ <artifactId>com-google-step2-common</artifactId>
<version>0</version>
<packaging>jar</packaging>
Modified: portals/jetspeed-2/portal/trunk/openid-step2/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/openid-step2/pom.xml?rev=1079007&r1=1079006&r2=1079007&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/openid-step2/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/openid-step2/pom.xml Mon Mar 7 22:55:55
2011
@@ -22,8 +22,12 @@
<name>STEP2 Project</name>
- <groupId>com.google.step2</groupId>
- <artifactId>step2-parent</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-2</artifactId>
+ <version>2.2.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>com-google-step2-parent</artifactId>
<version>0</version>
<packaging>pom</packaging>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1079007&r1=1079006&r2=1079007&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Mar 7 22:55:55 2011
@@ -1469,8 +1469,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.step2</groupId>
- <artifactId>step2-common</artifactId>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>com-google-step2-common</artifactId>
<version>${step2.version}</version>
<exclusions>
<exclusion>
@@ -2063,6 +2063,7 @@
<module>maven</module>
<module>jetspeed-portal-resources</module>
<module>jetspeed-commons</module>
+ <module>openid-step2</module>
<module>components</module>
<module>jetspeed-ant-tasks</module>
<module>applications</module>
@@ -2093,6 +2094,7 @@
<module>maven</module>
<module>jetspeed-portal-resources</module>
<module>jetspeed-commons</module>
+ <module>openid-step2</module>
<module>components</module>
<module>jetspeed-ant-tasks</module>
<module>applications</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
