directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r639813 - /directory/triplesec/trunk/pom.xml
Date Fri, 21 Mar 2008 20:35:36 GMT
Author: felixk
Date: Fri Mar 21 13:35:35 2008
New Revision: 639813

URL: http://svn.apache.org/viewvc?rev=639813&view=rev
Log:
- Update to latest TLP pom
- Remove inheritable entries
- Formatting

Modified:
    directory/triplesec/trunk/pom.xml

Modified: directory/triplesec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/pom.xml?rev=639813&r1=639812&r2=639813&view=diff
==============================================================================
--- directory/triplesec/trunk/pom.xml (original)
+++ directory/triplesec/trunk/pom.xml Fri Mar 21 13:35:35 2008
@@ -1,6 +1,6 @@
-<?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
@@ -8,25 +8,24 @@
   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
-
+  
+  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>
+<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.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>7</version>
+    <version>10-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.directory.triplesec</groupId>
@@ -145,7 +144,7 @@
         <artifactId>xmlParserAPIs</artifactId>
         <version>2.6.2</version>
       </dependency>
-    
+
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
@@ -312,7 +311,7 @@
         <artifactId>jcharts</artifactId>
         <version>0.6.0</version>
       </dependency>
-     
+
       <dependency>
         <groupId>myfaces</groupId>
         <artifactId>myfaces-api</artifactId>
@@ -336,7 +335,7 @@
         <artifactId>commons-digester</artifactId>
         <version>1.5</version>
       </dependency>
-      
+
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
@@ -398,174 +397,160 @@
 
   <inceptionYear>2005</inceptionYear>
 
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/trunks/triplesec</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/trunks/triplesec</developerConnection>
     <url>https://svn.apache.org/viewvc/directory/trunks/triplesec</url>
   </scm>
 
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-
-
   <build>
-         <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <forkMode>once</forkMode>
-                        <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false
-Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
-                        <workingDirectory>${project.build.directory}</workingDirectory>
-
-                        <!-- Override the default, do not accept Test* as test classes
-->
-                        <excludes>
-                            <exclude>**/Abstract*.java</exclude>
-                            <exclude>**/Test*.java</exclude>
-                        </excludes>
-                        <includes>
-                            <include>**/*Test.java</include>
-                        </includes>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <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>
-                    <configuration>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clover-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-4</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-one-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven</groupId>
-                            <artifactId>maven-archiver</artifactId>
-                            <!--
-                            FIXME: 2.1 is broken... won't allow custom manifestEntires, need
to use
-                                   until war plugin is updated.
-                            -->
-                            <version>2.2</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <version>1.4.5</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>dependency-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.2</version>
+          <configuration>
+            <forkMode>once</forkMode>
+            <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
+            <workingDirectory>${project.build.directory}</workingDirectory>
+
+            <!-- Override the default, do not accept Test* as test classes -->
+            <excludes>
+              <exclude>**/Abstract*.java</exclude>
+              <exclude>**/Test*.java</exclude>
+            </excludes>
+            <includes>
+              <include>**/*Test.java</include>
+            </includes>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <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>
+          <configuration>
+            <tarLongFileMode>gnu</tarLongFileMode>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clover-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-4</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-one-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.0.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven</groupId>
+              <artifactId>maven-archiver</artifactId>
+              <!--
+                FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+                until war plugin is updated.
+              -->
+              <version>2.2</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-idea-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+          <version>1.4.5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>dependency-maven-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.directory.daemon</groupId>
+          <artifactId>daemon-plugin</artifactId>
+          <version>1.0.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.directory.server</groupId>
+          <artifactId>apacheds-core-plugin</artifactId>
+          <version>1.0.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>6.1.0pre0</version>
+        </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-5</version>
-      </plugin>
+      </plugins>
+    </pluginManagement>
 
-       <plugin>
-        <groupId>org.apache.directory.daemon</groupId>
-        <artifactId>daemon-plugin</artifactId>
-        <version>1.0.0</version>
-       </plugin>
-      <plugin>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core-plugin</artifactId>
-        <version>1.0.0</version>
-      </plugin>
-
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.0pre0</version>
-      </plugin>
-
-           </plugins>
-        </pluginManagement>
-
-   <plugins>
+    <plugins>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -582,7 +567,7 @@
         <version>2.0-beta-5</version>
       </plugin>
 
-      
+
       <plugin>
         <inherited>false</inherited>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -594,11 +579,11 @@
                 <javadoc destdir="target/site/apidocs" author="true" use="true" windowtitle="Apache
Directory Triplesec">
                   <sourcepath>
                     <dirset dir=".">
-                      <include name="*/src/main/java"/>
-                      <exclude name="directory"/>
+                      <include name="*/src/main/java" />
+                      <exclude name="directory" />
                     </dirset>
                   </sourcepath>
-                  <package name="org.safehaus.triplesec.*"/>
+                  <package name="org.safehaus.triplesec.*" />
                 </javadoc>
               </tasks>
             </configuration>
@@ -608,7 +593,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
     </plugins>
 
   </build>
@@ -640,7 +625,7 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-    
+
       <modules>
         <module>changelog</module>
         <module>configuration</module>
@@ -673,14 +658,16 @@
         <module>swing-admin</module>
         <module>swing-demo</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>installers</id>
       <activation>
-        <property><name>installers</name></property>
+        <property>
+          <name>installers</name>
+        </property>
       </activation>
-    
+
       <modules>
         <module>changelog</module>
         <module>configuration</module>
@@ -714,29 +701,33 @@
         <module>webapp-smstrial</module>
         <module>swing-admin</module>
         <module>swing-demo</module>
-        
+
         <module>installers</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>smstrial</id>
       <activation>
-        <property><name>smstrial</name></property>
+        <property>
+          <name>smstrial</name>
+        </property>
       </activation>
-      
+
       <modules>
         <module>smstrial-schema</module>
         <module>webapp-smstrial</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>all</id>
       <activation>
-        <property><name>all</name></property>
+        <property>
+          <name>all</name>
+        </property>
       </activation>
-      
+
       <modules>
         <module>changelog</module>
         <module>configuration</module>
@@ -768,13 +759,13 @@
         <module>webapp-changelog</module>
         <module>swing-admin</module>
         <module>swing-demo</module>
-        
+
         <module>smstrial-schema</module>
         <module>webapp-smstrial</module>
-        
+
         <module>installers</module>
       </modules>
-      
+
     </profile>
   </profiles>
 



Mime
View raw message