You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by st...@apache.org on 2013/03/25 22:14:36 UTC

svn commit: r1460896 - in /oltu/trunk: oauth-2.0/client-demo/pom.xml oauth-2.0/common/pom.xml oauth-2.0/dynamicreg-common/pom.xml oauth-2.0/integration-tests/pom.xml oauth-2.0/pom.xml parent/pom.xml

Author: stein
Date: Mon Mar 25 21:14:36 2013
New Revision: 1460896

URL: http://svn.apache.org/r1460896
Log:
Fix build.

Modified:
    oltu/trunk/oauth-2.0/client-demo/pom.xml
    oltu/trunk/oauth-2.0/common/pom.xml
    oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml
    oltu/trunk/oauth-2.0/integration-tests/pom.xml
    oltu/trunk/oauth-2.0/pom.xml
    oltu/trunk/parent/pom.xml

Modified: oltu/trunk/oauth-2.0/client-demo/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client-demo/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client-demo/pom.xml (original)
+++ oltu/trunk/oauth-2.0/client-demo/pom.xml Mon Mar 25 21:14:36 2013
@@ -43,17 +43,23 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <!-- OAuth Dynamic Registration Dependency -->
 
     <dependency>
-      <artifactId>org.apache.oltu.oauth2.dynamicreg-common</artifactId>
       <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.dynamicreg.client</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>org.apache.oltu.oauth2.dynamicreg-client</artifactId>
       <groupId>org.apache.oltu.oauth2</groupId>
+      <artifactId>org.apache.oltu.oauth2.dynamicreg.common</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: oltu/trunk/oauth-2.0/common/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/common/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/common/pom.xml (original)
+++ oltu/trunk/oauth-2.0/common/pom.xml Mon Mar 25 21:14:36 2013
@@ -41,6 +41,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${commons-codec.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml (original)
+++ oltu/trunk/oauth-2.0/dynamicreg-common/pom.xml Mon Mar 25 21:14:36 2013
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu.oauth2</groupId>
     <artifactId>org.apache.oltu.oauth2.parent</artifactId>
-     <version>0.31-SNAPSHOT</version>
+    <version>0.31-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.apache.oltu.oauth2.dynamicreg.common</artifactId>

Modified: oltu/trunk/oauth-2.0/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/integration-tests/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/integration-tests/pom.xml (original)
+++ oltu/trunk/oauth-2.0/integration-tests/pom.xml Mon Mar 25 21:14:36 2013
@@ -61,13 +61,13 @@
 
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.dynamicreg-client</artifactId>
+      <artifactId>org.apache.oltu.oauth2.dynamicreg.client</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.dynamicreg-server</artifactId>
+      <artifactId>org.apache.oltu.oauth2.dynamicreg.server</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: oltu/trunk/oauth-2.0/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/pom.xml (original)
+++ oltu/trunk/oauth-2.0/pom.xml Mon Mar 25 21:14:36 2013
@@ -22,6 +22,7 @@
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
     <version>1-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.apache.oltu.oauth2</groupId>
@@ -35,7 +36,6 @@
     <module>common</module>
     <module>client</module>
     <module>httpclient4</module>
-    <module>client-demo</module>
     <module>dynamicreg-client</module>
     <module>dynamicreg-common</module>
     <module>authzserver</module>
@@ -43,6 +43,7 @@
     <module>resourceserver-filter</module>
     <module>dynamicreg-server</module>
     <module>test-utils</module>
+    <module>client-demo</module>
     <module>integration-tests</module>
   </modules>
 
@@ -56,12 +57,13 @@
        <sendOnFailure>true</sendOnFailure>
        <sendOnSuccess>false</sendOnSuccess>
        <sendOnWarning>false</sendOnWarning>
-       <configuration><address>dev@oltu.apache.org</address></configuration> 
+       <configuration><address>dev@oltu.apache.org</address></configuration>
      </notifier>
    </notifiers>
   </ciManagement>
 
   <properties>
+    <commons-codec.version>1.7</commons-codec.version>
     <cxf.version>2.2.10</cxf.version>
     <org.springframework.version>3.0.3.RELEASE</org.springframework.version>
     <spring-mock.version>2.0.8</spring-mock.version>

Modified: oltu/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/parent/pom.xml?rev=1460896&r1=1460895&r2=1460896&view=diff
==============================================================================
--- oltu/trunk/parent/pom.xml (original)
+++ oltu/trunk/parent/pom.xml Mon Mar 25 21:14:36 2013
@@ -18,12 +18,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>10</version>
-  </parent>
-
   <groupId>org.apache.oltu</groupId>
   <artifactId>org.apache.oltu.parent</artifactId>
   <version>1-SNAPSHOT</version>