directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r642494 - in /directory/sandbox/akarasulu/bigbang/project: ./ LAST_BIG_BANG_MERGE pom.xml site/
Date Sat, 29 Mar 2008 02:57:49 GMT
Author: akarasulu
Date: Fri Mar 28 19:57:38 2008
New Revision: 642494

URL: http://svn.apache.org/viewvc?rev=642494&view=rev
Log:
[MERGE][613581:642493] pulling in changes from bigbang since last merge

Removed:
    directory/sandbox/akarasulu/bigbang/project/site/
Modified:
    directory/sandbox/akarasulu/bigbang/project/   (props changed)
    directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
    directory/sandbox/akarasulu/bigbang/project/pom.xml

Propchange: directory/sandbox/akarasulu/bigbang/project/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 19:57:38 2008
@@ -7,3 +7,5 @@
 server-work
 *.log
 target
+.classpath
+.project

Modified: directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE?rev=642494&r1=642493&r2=642494&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE Fri Mar 28 19:57:38 2008
@@ -1,3 +1,6 @@
+$Rev$
+$Date$
+
 This file shows the last time I merged from the big bang branch here as a commit
 number:
 
@@ -7,6 +10,9 @@
 Tue Mar 18 00:52:06 EDT 2008
 ----------------------------
 svn merge -r 613581:638215 https://svn.apache.org/repos/asf/directory/project/branches/bigbang
.
-$Rev$
-$Date$
+
+
+Fri Mar 28 22:58:52 EDT 2008
+----------------------------
+svn merge -r 613581:642493 https://svn.apache.org/repos/asf/directory/project/branches/bigbang
.
 

Modified: directory/sandbox/akarasulu/bigbang/project/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/pom.xml?rev=642494&r1=642493&r2=642494&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/project/pom.xml Fri Mar 28 19:57:38 2008
@@ -1,6 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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.
+-->
+
 <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>
@@ -8,12 +27,154 @@
     <version>4</version>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.directory.project</groupId>
   <version>10-SNAPSHOT</version>
   <artifactId>project</artifactId>
+  <packaging>pom</packaging>
   <name>Apache Directory Project</name>
+  <version>10-SNAPSHOT</version>
+
+  <ciManagement>
+    <system>continuum</system>
+    <url>http://vm094.oxylos.org/continuum/</url>
+    <notifiers>
+      <notifier>
+        <type>mail</type>
+        <sendOnError>true</sendOnError>
+        <sendOnFailure>true</sendOnFailure>
+        <sendOnSuccess>true</sendOnSuccess>
+        <sendOnWarning>false</sendOnWarning>
+        <configuration>
+          <address>notifications@directory.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+
   <inceptionYear>2003</inceptionYear>
-  <packaging>pom</packaging>
+
+  <mailingLists>
+    <mailingList>
+      <name>The Directory Developers List</name>
+      <subscribe>dev-subscribe@directory.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@directory.apache.org</unsubscribe>
+      <post>dev@directory.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/directory-dev</archive>
+      <otherArchives>
+        <otherArchive>http://www.archivum.info/dev@directory.apache.org/</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>The Directory Users List</name>
+      <subscribe>users-subscribe@directory.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@directory.apache.org</unsubscribe>
+      <post>users@directory.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/directory-users</archive>
+    </mailingList>
+    <mailingList>
+      <name>The Directory Commits (SVN) List</name>
+      <subscribe>commits-subscribe@directory.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@directory.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/directory-commits</archive>
+      <otherArchives>
+        <otherArchive>http://www.archivum.info/commits@directory.apache.org/</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>The Directory Notifications (CI) List</name>
+      <subscribe>notifications-subscribe@directory.apache.org</subscribe>
+      <unsubscribe>notifications-unsubscribe@directory.apache.org</unsubscribe>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <id>adc</id>
+    </developer>
+    <developer>
+      <id>akarasulu</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>bayard</id>
+    </developer>
+    <developer>
+      <id>bloritsch</id>
+    </developer>
+    <developer>
+      <id>brett</id>
+    </developer>
+    <developer>
+      <id>ckoppelt</id>
+    </developer>
+    <developer>
+      <id>elecharny</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>erodriguez</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>ersiner</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>felixk</id>
+      <name>Felix Knecht</name>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org/</organizationUrl>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>jmachols</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>niklas</id>
+    </developer>
+    <developer>
+      <id>noel</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>pamarcelot</id>
+    </developer>
+    <developer>
+      <id>psteitz</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>szoerner</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>tbennett</id>
+    </developer>
+    <developer>
+      <id>trustin</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>vtence</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+    <developer>
+      <id>wesmckean</id>
+      <url>http://directory.apache.org/community%26resources/the-team.html</url>
+    </developer>
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Nick Faiz</name>
+    </contributor>
+  </contributors>
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/project/branches/bigbang</connection>
@@ -21,35 +182,30 @@
     <url>http://svn.apache.org/viewvc/directory/project/branches/bigbang</url>
   </scm>
 
-  <!-- =======================  WARNING ========================== -->
-  <!-- Only put pluginManagement info in this pom for plugins      -->
-  <!-- shared among shared, apacheds, and daemon subprojects       -->
-  <!-- dependencyManagement is likely to change too quickly to be  -->
-  <!-- useful in this pom                                          -->
-  <!-- =======================  WARNING ========================== -->
-
   <build>
+    <!-- =======================  WARNING ========================== -->
+    <!-- Only put pluginManagement info in this pom for plugins      -->
+    <!-- shared among shared, apacheds, and daemon subprojects       -->
+    <!-- dependencyManagement is likely to change too quickly to be  -->
+    <!-- useful in this pom                                          -->
+    <!-- =======================  WARNING ========================== -->
     <pluginManagement>
       <plugins>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.1</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.1</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
           <version>2.2</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -62,43 +218,40 @@
             <encoding>ISO-8859-1</encoding>
           </configuration>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <version>2.4</version>
+          <configuration>
+            <downloadSources>true</downloadSources>
+            <downloadJavadocs>true</downloadJavadocs>
+          </configuration>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
           <version>2.2</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.2</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
          <version>2.0.4</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.3</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <version>2.3</version>
         </plugin>
-
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
           <version>1.0-alpha-4</version>
@@ -119,11 +272,10 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>2.0-beta-7</version>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.0-beta-2</version>
+          <version>1.0</version>
           <executions>
             <execution>
               <goals>
@@ -131,28 +283,66 @@
               </goals>
               <configuration>
                 <resourceBundles>
-                  <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+                  <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                 </resourceBundles>
-                <!-- hack to share the same corrections among all modules -->
-                <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
               </configuration>
             </execution>
           </executions>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.4.2</version>
           <configuration>
             <argLine>-Xmx1024m</argLine>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-stage-plugin</artifactId>
+          <version>1.0-alpha-1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>rat-maven-plugin</artifactId>
+          <version>1.0-alpha-3</version>
+          <configuration>
+            <excludeSubProjects>false</excludeSubProjects>
+          </configuration>
+        </plugin>
 
+        <plugin>
+            <groupId>org.apache.geronimo.genesis.plugins</groupId>
+            <artifactId>tools-maven-plugin</artifactId>
+            <version>1.4</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+          <groupId>org.apache.geronimo.genesis.plugins</groupId>
+          <artifactId>tools-maven-plugin</artifactId>
+          <executions>
+              <execution>
+                  <id>verify-legal-files</id>
+                  <phase>verify</phase>
+                  <goals>
+                      <goal>verify-legal-files</goal>
+                  </goals>
+                  <configuration>
+                      <!-- Fail the build if no legal files were found -->
+                      <strict>true</strict>
+                  </configuration>
+              </execution>
+          </executions>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -161,12 +351,16 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-stage-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/directory/project/releases</tagBase>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 
@@ -193,4 +387,45 @@
       </build>
     </profile>
   </profiles>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.directory.plugins</id>
+      <name>Plugin repository for the Apache Directory Studio plugin</name>
+      <url>http://vm094.oxylos.org/mirror-maven2/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <reporting>
+    <excludeDefaults>true</excludeDefaults>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>project-team</report>
+              <report>mailing-list</report>
+              <report>license</report>
+              <report>dependencies</report>
+              <report>issue-tracking</report>
+              <report>index</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+  
+  <distributionManagement>
+    <snapshotRepository>
+      <id>apache.directory.snapshot.repo</id>
+      <name>Snapshot repository for the Apache Directory project</name>
+      <uniqueVersion>false</uniqueVersion>
+      <url>scpexe://vm094.oxylos.org/var/www/html/mirror-maven2</url>
+    </snapshotRepository>
+  </distributionManagement>
+
 </project>



Mime
View raw message