oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1575314 - in /oltu/trunk: commons/deploySite.sh commons/pom.xml jose/deploySite.sh jose/pom.xml oauth-2.0/deploySite.sh oauth-2.0/pom.xml openid-connect/deploySite.sh openid-connect/pom.xml parent/pom.xml site/pom.xml
Date Fri, 07 Mar 2014 16:36:07 GMT
Author: simonetripodi
Date: Fri Mar  7 16:36:07 2014
New Revision: 1575314

URL: http://svn.apache.org/r1575314
Log:
OLTU-139 - Publish all Javadocs: all Oltu modules now support APIs doc deployment

Added:
    oltu/trunk/commons/deploySite.sh   (with props)
    oltu/trunk/jose/deploySite.sh   (with props)
    oltu/trunk/openid-connect/deploySite.sh   (with props)
Modified:
    oltu/trunk/commons/pom.xml
    oltu/trunk/jose/pom.xml
    oltu/trunk/oauth-2.0/deploySite.sh
    oltu/trunk/oauth-2.0/pom.xml
    oltu/trunk/openid-connect/pom.xml
    oltu/trunk/parent/pom.xml
    oltu/trunk/site/pom.xml

Added: oltu/trunk/commons/deploySite.sh
URL: http://svn.apache.org/viewvc/oltu/trunk/commons/deploySite.sh?rev=1575314&view=auto
==============================================================================
--- oltu/trunk/commons/deploySite.sh (added)
+++ oltu/trunk/commons/deploySite.sh Fri Mar  7 16:36:07 2014
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+mvn clean site site:stage -P site
+mvn scm-publish:publish-scm -Dusername=$1 -Dpassword=$2 -P site

Propchange: oltu/trunk/commons/deploySite.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: oltu/trunk/commons/deploySite.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: oltu/trunk/commons/deploySite.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: oltu/trunk/commons/deploySite.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: oltu/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/commons/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/commons/pom.xml (original)
+++ oltu/trunk/commons/pom.xml Fri Mar  7 16:36:07 2014
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>2</version>
+    <version>3-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -30,7 +30,7 @@
   <version>2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Oltu - Commons - Parent</name>
+  <name>Apache Oltu - Commons</name>
   <description>Shared utilities across multiple Apache Oltu modules</description>
 
   <scm>
@@ -39,9 +39,51 @@
     <url>https://svn.apache.org/repos/asf/oltu/trunk/commons</url>
   </scm>
 
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${siteUrlDeployment}</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <siteFilePath>${user.home}/oltu-sites/oltu-commons-site/</siteFilePath>
+    <siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
+    <scmPubCheckoutDirectory>${user.home}/oltu-sites/oltu-commons</scmPubCheckoutDirectory>
+  </properties>
+
   <modules>
     <module>encodedtoken</module>
     <module>json</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <configuration>
+              <inputDirectory>${project.reporting.outputDirectory}/apidocs</inputDirectory>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-publish-plugin</artifactId>
+            <configuration>
+              <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+              <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/oltu/site/apidocs/commons</pubScmUrl>
+              <checkinComment>Oltu Commons apidocs deployment</checkinComment>
+              <content>${project.build.directory}/staging</content>
+              <tryUpdate>true</tryUpdate>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Added: oltu/trunk/jose/deploySite.sh
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/deploySite.sh?rev=1575314&view=auto
==============================================================================
--- oltu/trunk/jose/deploySite.sh (added)
+++ oltu/trunk/jose/deploySite.sh Fri Mar  7 16:36:07 2014
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+mvn clean site site:stage -P site
+mvn scm-publish:publish-scm -Dusername=$1 -Dpassword=$2 -P site

Propchange: oltu/trunk/jose/deploySite.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: oltu/trunk/jose/deploySite.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: oltu/trunk/jose/deploySite.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: oltu/trunk/jose/deploySite.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: oltu/trunk/jose/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/jose/pom.xml (original)
+++ oltu/trunk/jose/pom.xml Fri Mar  7 16:36:07 2014
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>2</version>
+    <version>3-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -30,7 +30,7 @@
   <version>2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Oltu - JOSE - Parent</name>
+  <name>Apache Oltu - JOSE</name>
   <description>JOSE working group specifications in Apache Oltu</description>
 
   <scm>
@@ -39,8 +39,50 @@
     <url>https://svn.apache.org/repos/asf/oltu/trunk/jose</url>
   </scm>
 
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${siteUrlDeployment}</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <siteFilePath>${user.home}/oltu-sites/oltu-jose-site/</siteFilePath>
+    <siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
+    <scmPubCheckoutDirectory>${user.home}/oltu-sites/oltu-jose</scmPubCheckoutDirectory>
+  </properties>
+
   <modules>
     <module>jws</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <configuration>
+              <inputDirectory>${project.reporting.outputDirectory}/apidocs</inputDirectory>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-publish-plugin</artifactId>
+            <configuration>
+              <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+              <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/oltu/site/apidocs/jose</pubScmUrl>
+              <checkinComment>Oltu JOSE apidocs deployment</checkinComment>
+              <content>${project.build.directory}/staging</content>
+              <tryUpdate>true</tryUpdate>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: oltu/trunk/oauth-2.0/deploySite.sh
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/deploySite.sh?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/deploySite.sh (original)
+++ oltu/trunk/oauth-2.0/deploySite.sh Fri Mar  7 16:36:07 2014
@@ -19,4 +19,5 @@
 # under the License.
 #
 
-mvn -P site clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage -P site
+mvn scm-publish:publish-scm -Dusername=$1 -Dpassword=$2 -P site

Modified: oltu/trunk/oauth-2.0/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/pom.xml (original)
+++ oltu/trunk/oauth-2.0/pom.xml Fri Mar  7 16:36:07 2014
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>2</version>
+    <version>3-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -30,7 +30,7 @@
   <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Oltu - OAuth 2.0 - Parent</name>
+  <name>Apache Oltu - OAuth 2.0</name>
 
   <scm>
     <connection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/oauth-2.0</connection>
@@ -53,6 +53,12 @@
     <module>jwt</module>
   </modules>
 
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${siteUrlDeployment}</url>
+    </site>
+  </distributionManagement>
   <ciManagement>
     <system>Jenkins</system>
     <url>https://builds.apache.org/job/Oltu-OAuth-2.0/</url>
@@ -131,4 +137,33 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <configuration>
+              <inputDirectory>${project.reporting.outputDirectory}/apidocs</inputDirectory>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-publish-plugin</artifactId>
+            <configuration>
+              <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+              <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/oltu/site/apidocs/oauth2</pubScmUrl>
+              <checkinComment>Oltu OAuth2 apidocs deployment</checkinComment>
+              <content>${project.build.directory}/staging</content>
+              <tryUpdate>true</tryUpdate>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Added: oltu/trunk/openid-connect/deploySite.sh
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/deploySite.sh?rev=1575314&view=auto
==============================================================================
--- oltu/trunk/openid-connect/deploySite.sh (added)
+++ oltu/trunk/openid-connect/deploySite.sh Fri Mar  7 16:36:07 2014
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+mvn clean site site:stage -P site
+mvn scm-publish:publish-scm -Dusername=$1 -Dpassword=$2 -P site

Propchange: oltu/trunk/openid-connect/deploySite.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: oltu/trunk/openid-connect/deploySite.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: oltu/trunk/openid-connect/deploySite.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: oltu/trunk/openid-connect/deploySite.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: oltu/trunk/openid-connect/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/openid-connect/pom.xml (original)
+++ oltu/trunk/openid-connect/pom.xml Fri Mar  7 16:36:07 2014
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>1</version>
+    <version>3-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -30,13 +30,20 @@
   <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Oltu - OpenId Connect - Parent</name>
+  <name>Apache Oltu - OpenId Connect</name>
 
-  <modules>
-    <module>common</module>
-    <module>client</module>
-  </modules>
+  <scm>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/openid-connect</developerConnection>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/openid-connect</connection>
+    <url>https://svn.apache.org/repos/asf/oltu/trunk/openid-connect</url>
+  </scm>
 
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${siteUrlDeployment}</url>
+    </site>
+  </distributionManagement>
   <ciManagement>
     <system>Jenkins</system>
     <url>https://builds.apache.org/job/Oltu-OpenID-Conect/</url>
@@ -52,4 +59,38 @@
    </notifiers>
   </ciManagement>
 
+  <modules>
+    <module>common</module>
+    <module>client</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <configuration>
+              <inputDirectory>${project.reporting.outputDirectory}/apidocs</inputDirectory>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-publish-plugin</artifactId>
+            <configuration>
+              <checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory>
+              <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/oltu/site/apidocs/openid-connect</pubScmUrl>
+              <checkinComment>Oltu OpenID Connect apidocs deployment</checkinComment>
+              <content>${project.build.directory}/staging</content>
+              <tryUpdate>true</tryUpdate>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: oltu/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/parent/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/parent/pom.xml (original)
+++ oltu/trunk/parent/pom.xml Fri Mar  7 16:36:07 2014
@@ -349,18 +349,6 @@
     -->
     <javadoc.version>2.9.1</javadoc.version>
     <!--
-     | Oltu website has to be stored in SVN
-     |
-     | mvn -P site clean site-deploy scm-publish:publish-scm -Dusername=${uid} -Dpassword=${pwd}
-     |
-     | or
-     |
-     | sh -P site deploySite.sh -Dusername=${uid} -Dpassword=${pwd}
-    -->
-    <site.siteFilePath>${user.home}/oltu-site/</site.siteFilePath>
-    <site.deploymentBaseUrl>file://${site.siteFilePath}</site.deploymentBaseUrl>
-    <site.scmPubCheckoutDirectory>${user.home}/oltu-site-content/</site.scmPubCheckoutDirectory>
-    <!--
      | OSGi settings
     -->
     <osgi.export>${project.artifactId};version=${project.version}</osgi.export>
@@ -507,13 +495,9 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.0-beta-2</version>
+          <version>1.0</version>
           <configuration>
             <tryUpdate>true</tryUpdate>
-            <checkoutDirectory>${site.scmPubCheckoutDirectory}</checkoutDirectory>
-            <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/oltu/site</pubScmUrl>
-            <checkinComment>Apache Oltu site deployment</checkinComment>
-            <content>${site.siteFilePath}</content>
           </configuration>
         </plugin>
       </plugins>
@@ -895,7 +879,7 @@
                 -quiet
                 -federate JDK http://download.oracle.com/javase/6/docs/api/index.html?
                 -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml
-                -hdf project.name "Apache Oltu"
+                -hdf project.name "${project.name}"
                 -apiversion "${project.version}"
                 -d ${project.reporting.outputDirectory}/apidocs
               </additionalparam>

Modified: oltu/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/site/pom.xml?rev=1575314&r1=1575313&r2=1575314&view=diff
==============================================================================
--- oltu/trunk/site/pom.xml (original)
+++ oltu/trunk/site/pom.xml Fri Mar  7 16:36:07 2014
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>2</version>
+    <version>3-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.apache.oltu.site</artifactId>
@@ -34,6 +34,12 @@
   <name>Apache Oltu</name>
   <url>https://oltu.apache.org/</url>
 
+  <scm>
+    <url>https://svn.apache.org/viewvc/oltu/trunk/site</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/site</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/site</developerConnection>
+  </scm>
+
   <properties>
     <svnUrl>https://svn.apache.org/repos/asf/oltu/site/</svnUrl>
     <checkoutDirectory>site-publish</checkoutDirectory>
@@ -46,6 +52,17 @@
     </site>
   </distributionManagement>
 
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
   <build>
     <plugins>
       <plugin>
@@ -95,6 +112,8 @@
           <checkinComment>Oltu main site deployment</checkinComment>
           <ignorePathsToDelete>
             <ignorePathToDelete>apidocs**</ignorePathToDelete>
+            <ignorePathToDelete>amber-sources**</ignorePathToDelete>
+            <ignorePathToDelete>amber-oauth2-parent**</ignorePathToDelete>
           </ignorePathsToDelete>
           <checkoutDirectory>${checkoutDirectory}</checkoutDirectory>
         </configuration>
@@ -111,16 +130,21 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <checkoutDirectoryName>org.apache.oltu</checkoutDirectoryName>
+          <webAccessUrl>https://svn.apache.org/viewvc/oltu/trunk/</webAccessUrl>
+          <anonymousConnection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/</anonymousConnection>
+          <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/</developerConnection>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 
   <profiles>
     <profile>
@@ -150,7 +174,9 @@
                     </exec>
 
                     <exec executable="svn">
-                      <arg line="update --set-depth exclude ${checkoutDirectory}/apidocs"
/>
+                      <arg line="update --set-depth exclude ${checkoutDirectory}/apidocs
+                                                            ${checkoutDirectory}/amber-sources
+                                                            ${checkoutDirectory}/amber-oauth2-parent"
/>
                     </exec>
 
                     <pathconvert pathsep=" " property="dirs">



Mime
View raw message