directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r368850 - in /directory/trunks: apacheds/core-unit/pom.xml apacheds/core/pom.xml apacheds/plugin/pom.xml apacheds/pom.xml apacheds/protocols/common/pom.xml apacheds/protocols/pom.xml apacheds/server-ssl/pom.xml apacheds/server/pom.xml pom.xml
Date Fri, 13 Jan 2006 20:53:23 GMT
Author: akarasulu
Date: Fri Jan 13 12:53:18 2006
New Revision: 368850

URL: http://svn.apache.org/viewcvs?rev=368850&view=rev
Log:
intermediate state will fix soon: reorg of repo in effect

Modified:
    directory/trunks/apacheds/core-unit/pom.xml
    directory/trunks/apacheds/core/pom.xml
    directory/trunks/apacheds/plugin/pom.xml
    directory/trunks/apacheds/pom.xml
    directory/trunks/apacheds/protocols/common/pom.xml
    directory/trunks/apacheds/protocols/pom.xml
    directory/trunks/apacheds/server-ssl/pom.xml
    directory/trunks/apacheds/server/pom.xml
    directory/trunks/pom.xml

Modified: directory/trunks/apacheds/core-unit/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/pom.xml (original)
+++ directory/trunks/apacheds/core-unit/pom.xml Fri Jan 13 12:53:18 2006
@@ -36,44 +36,31 @@
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
-  	<profile>
-  	  <id>no-regression-tests</id>
-  	  <activation>
-  	  	<activeByDefault>true</activeByDefault>
-  	  </activation>
-  	  <build>
-  	    <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <!-- TODO
-                   Need to rename all regression tests to have Regression
-                   in the name of the test so we can change the exclude below
-                   to only refer to these tests rather than all tests like so:
+    <profile>
+    <id>no-regression-tests</id>
+    <activation>
+      <activeByDefault>true</activeByDefault>
+    </activation>
+    <build>
+      <plugins>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <!-- TODO
+                Need to rename all regression tests to have Regression
+                in the name of the test so we can change the exclude below
+                to only refer to these tests rather than all tests like so:
                 
-                   <exclude>**/*Regression*Test*</exclude>
-                 -->
-                <exclude>**/*Test.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+                <exclude>**/*Regression*Test*</exclude>
+                -->
+              <exclude>**/*Test.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
                 <phase>validate</phase>
@@ -96,15 +83,15 @@
               </execution>
             </executions>
           </plugin>
-   	    </plugins>
+   	</plugins>
       </build>
-	</profile>
-  	<profile>
+    </profile>
+    <profile>
       <id>regressions</id>
       <activation>
         <property><name>regressions</name></property>
       </activation>
-  	</profile>
+    </profile>
   </profiles>
 </project>
 

Modified: directory/trunks/apacheds/core/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/core/pom.xml (original)
+++ directory/trunks/apacheds/core/pom.xml Fri Jan 13 12:53:18 2006
@@ -40,7 +40,6 @@
   </dependencies>
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>org.apache.ldap.server.plugin</artifactId>
@@ -160,15 +159,6 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
       </plugin>
     </plugins>
     <resources>

Modified: directory/trunks/apacheds/plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/plugin/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/plugin/pom.xml (original)
+++ directory/trunks/apacheds/plugin/pom.xml Fri Jan 13 12:53:18 2006
@@ -38,7 +38,6 @@
   </dependencies>
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antlr-plugin</artifactId>
@@ -55,15 +54,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
@@ -71,7 +61,6 @@
           </excludes>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 </project>

Modified: directory/trunks/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/pom.xml Fri Jan 13 12:53:18 2006
@@ -14,7 +14,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory</groupId>
+      <groupId>org.apache.directory.common</groupId>
       <artifactId>org.apache.ldap.common</artifactId>
       <version>0.9.4-SNAPSHOT</version>
     </dependency>
@@ -31,10 +31,12 @@
         <module>shared</module>
         <module>plugin</module>
         <module>core-unit</module>
+        <!--
         <module>server</module>
         <module>server-ssl</module>
         <module>server-unit</module>
         <module>server-main</module>
+        -->
         <module>protocols</module>
       </modules>
     </profile>

Modified: directory/trunks/apacheds/protocols/common/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/common/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/common/pom.xml (original)
+++ directory/trunks/apacheds/protocols/common/pom.xml Fri Jan 13 12:53:18 2006
@@ -2,7 +2,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.server.protocols</groupId>
+    <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
     <version>0.9.4-SNAPSHOT</version>
   </parent>
@@ -48,15 +48,6 @@
             <exclude>**/TestUtils.java</exclude>
             <exclude>**/KerberosTest.java</exclude>
           </excludes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
         </configuration>
       </plugin>
     </plugins>

Modified: directory/trunks/apacheds/protocols/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocols/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/protocols/pom.xml (original)
+++ directory/trunks/apacheds/protocols/pom.xml Fri Jan 13 12:53:18 2006
@@ -12,16 +12,7 @@
   <name>protocols-build</name>
   <packaging>pom</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.directory</groupId>
-      <artifactId>org.apache.ldap.common</artifactId>
-      <version>0.9.4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
   <modules>
-    <module>common</module>
     <!--
     <module>ntp</module>
     <module>dns</module>

Modified: directory/trunks/apacheds/server-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-ssl/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/pom.xml (original)
+++ directory/trunks/apacheds/server-ssl/pom.xml Fri Jan 13 12:53:18 2006
@@ -13,7 +13,8 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <version>1.2.17</version>
+      <version>1.2.19</version>
+      <scope>provided</scope>
     </dependency>  
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -32,17 +33,5 @@
       <version>0.9.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
 

Modified: directory/trunks/apacheds/server/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/apacheds/server/pom.xml (original)
+++ directory/trunks/apacheds/server/pom.xml Fri Jan 13 12:53:18 2006
@@ -13,7 +13,8 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <version>1.2.17</version>
+      <version>1.2.19</version>
+      <scope>provided</scope>
     </dependency>  
     <dependency>
       <groupId>org.apache.directory</groupId>
@@ -41,17 +42,5 @@
       <version>0.9.4-SNAPSHOT</version>
     </dependency>  
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
 

Modified: directory/trunks/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/pom.xml?rev=368850&r1=368849&r2=368850&view=diff
==============================================================================
--- directory/trunks/pom.xml (original)
+++ directory/trunks/pom.xml Fri Jan 13 12:53:18 2006
@@ -9,9 +9,7 @@
   <modules>
     <module>asn1</module>
     <module>mina</module>
-    <!-- 
     <module>apacheds</module>
-    -->
     <module>common</module>
   </modules>
   <dependencies>



Mime
View raw message