directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1071139 [3/3] - in /directory/shared/branches/m1: ./ all/ all/src/ all/src/main/ all/src/main/appended-resources/ all/src/main/appended-resources/META-INF/ asn1-api/ asn1-ber/ distribution/ distribution/src/ distribution/src/main/ distribu...
Date Wed, 16 Feb 2011 04:26:41 GMT
Propchange: directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 04:26:37 2011
@@ -7,4 +7,4 @@
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
-/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1068227
+/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1071137

Propchange: directory/shared/branches/m1/ldap-schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 04:26:37 2011
@@ -8,4 +8,4 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
-/directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1071137

Modified: directory/shared/branches/m1/ldap-schema-converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-schema-converter/pom.xml?rev=1071139&r1=1071138&r2=1071139&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-schema-converter/pom.xml (original)
+++ directory/shared/branches/m1/ldap-schema-converter/pom.xml Wed Feb 16 04:26:37 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.shared</groupId>
     <artifactId>shared-parent</artifactId>
-    <version>0.9.20-SNAPSHOT</version>
+    <version>1.0.0-M2-SNAPSHOT</version>
   </parent>
   
   <artifactId>shared-ldap-schema-converter</artifactId>
@@ -38,12 +38,6 @@
     </dependency>
     
     <dependency>
-      <groupId>com.mycila</groupId>
-      <artifactId>mycila-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
@@ -87,7 +81,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>antlr-maven-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <grammars>*.g</grammars>
         </configuration>

Modified: directory/shared/branches/m1/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-schema/pom.xml?rev=1071139&r1=1071138&r2=1071139&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-schema/pom.xml (original)
+++ directory/shared/branches/m1/ldap-schema/pom.xml Wed Feb 16 04:26:37 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.shared</groupId>
     <artifactId>shared-parent</artifactId>
-    <version>0.9.20-SNAPSHOT</version>
+    <version>1.0.0-M2-SNAPSHOT</version>
   </parent>
   
   <artifactId>shared-ldap-schema</artifactId>
@@ -42,12 +42,6 @@
     </dependency>
     
     <dependency>
-      <groupId>com.mycila</groupId>
-      <artifactId>mycila-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-i18n</artifactId>
     </dependency>
@@ -85,8 +79,8 @@
             <configuration>
               <target>
                 <!-- Various properties -->
-                <property name="schema.index" value="target/generated-resources/apacheds/META-INF/apacheds-schema.index"/>
-                <property name="schema.location" value="src${file.separator}main${file.separator}resources${file.separator}"/>
+                <property name="schema.index" value="target/generated-resources/apacheds/META-INF/apacheds-schema.index"
/>
+                <property name="schema.location" value="src${file.separator}main${file.separator}resources${file.separator}"
/>
               
                 <!-- Listing all LDIF files under schema location -->
                 <path id="schema.files.path">
@@ -95,17 +89,17 @@
                     <exclude name="schema-all.ldif" />
                   </fileset>
                 </path>
-                <property name="schema.files" refid="schema.files.path"/>
+                <property name="schema.files" refid="schema.files.path" />
                 
                 <!-- Creating the schema index file -->
-                <echo message="${schema.files}" file="${schema.index}"/>
+                <echo message="${schema.files}" file="${schema.index}" />
                 <replace file="${schema.index}">
                   <!-- Replace the path separator (':' on Unix, ';' on Windows) by a new
line -->
-                  <replacefilter token="${path.separator}" value="${line.separator}"/>
+                  <replacefilter token="${path.separator}" value="${line.separator}" />
                   <!-- Remove the full path of the schema location to get relative paths
for files -->
-                  <replacefilter token="${basedir}${file.separator}${schema.location}"
value=""/>
+                  <replacefilter token="${basedir}${file.separator}${schema.location}"
value="" />
                   <!-- Replace the file separator ('/' on Unix, '\' on Windows) by a '/'
- Useful on Windows -->
-                  <replacefilter token="${file.separator}" value="/"/>
+                  <replacefilter token="${file.separator}" value="/" />
                 </replace>
               </target>
             </configuration>

Propchange: directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 04:26:37 2011
@@ -7,5 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
-/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1071137
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Propchange: directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 04:26:37 2011
@@ -7,5 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
-/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1071137
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1071139&r1=1071138&r2=1071139&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Wed Feb 16 04:26:37 2011
@@ -30,7 +30,7 @@
   <artifactId>shared-parent</artifactId>
   <name>Apache Directory Shared</name>
   <packaging>pom</packaging>
-  <version>0.9.20-SNAPSHOT</version>
+  <version>1.0.0-M2-SNAPSHOT</version>
 
   <properties>
     <projectName>ApacheDS-Shared</projectName>
@@ -38,9 +38,8 @@
     
     <!-- Set versions for depending projects -->
     <skin.version>1.0.2</skin.version>
-    <org.apache.directory.junit.junit-addons.version>0.1-SNAPSHOT</org.apache.directory.junit.junit-addons.version>
-    <org.apache.directory.shared.version>0.9.20-SNAPSHOT</org.apache.directory.shared.version>
-    <org.apache.directory.checkstyle-configuration.version>0.2-SNAPSHOT</org.apache.directory.checkstyle-configuration.version>
+    <org.apache.directory.junit.junit-addons.version>0.1</org.apache.directory.junit.junit-addons.version>
+    <org.apache.directory.checkstyle-configuration.version>0.1</org.apache.directory.checkstyle-configuration.version>
     
     <!-- Set versions for depending jars -->
     <antlr.version>2.7.7</antlr.version>
@@ -50,7 +49,6 @@
     <commons.pool.version>1.5.5</commons.pool.version>
     <dom4j.version>1.6.1</dom4j.version>
     <junit.version>4.8.2</junit.version>
-    <mycila-junit.version>1.0.ga</mycila-junit.version>
     <log4j.version>1.2.16</log4j.version>
     <mina.core.version>2.0.2</mina.core.version>
     <org.apache.felix.version>3.0.2</org.apache.felix.version>
@@ -91,9 +89,50 @@
     <module>ldap-client-api</module>
     <module>dsml-parser</module>
     <module>dsml-engine</module>
+    <module>distribution</module>
   </modules>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludeSubProjects>false</excludeSubProjects>
+            <excludes>
+              <!-- MAVEN_DEFAULT_EXCLUDES -->
+              <exclude>**/target/**/*</exclude>
+              <exclude>**/cobertura.ser</exclude>
+              <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+              <exclude>**/.classpath</exclude>
+              <exclude>**/.project</exclude>
+              <exclude>**/.settings/**/*</exclude>
+              <!-- IDEA_DEFAULT_EXCLUDES -->
+              <exclude>**/*.iml</exclude>
+              <exclude>**/*.ipr</exclude>
+              <exclude>**/*.iws</exclude>
+              <!-- MANIFEST_MF_EXCLUDES -->
+              <exclude>**/MANIFEST.MF</exclude>
+              <!-- 3RD_PARTY_LICENSES -->
+              <exclude>distribution/src/main/release/licenses/*</exclude>
+              <exclude>src/main/release/licenses/*</exclude>
+              <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48
-->
+              <exclude>**/dependency-reduced-pom.xml</exclude>
+              <!-- Generated ldif files -->
+              <exclude>ldap-schema/src/main/resources/schema/**</exclude>
+              <exclude>ldap-schema/src/main/resources/schema-all.ldif</exclude>
+              <exclude>src/main/resources/schema/**</exclude>
+              <exclude>src/main/resources/schema-all.ldif</exclude>
+              <!-- Files having a Bouncy Castle license -->
+              <exclude>ldap/src/main/java/org/apache/directory/shared/asn1/der/*.java</exclude>
+              <exclude>src/main/java/org/apache/directory/shared/asn1/der/*.java</exclude>
+            </excludes>
+          </configuration>
+         </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -247,6 +286,7 @@
             <plugin>
               <groupId>org.apache.rat</groupId>
               <artifactId>apache-rat-plugin</artifactId>
+              <!-- must add configuration here too, it isn't inherited from <pluginConfiguration>
:-( -->
               <configuration>
                 <excludeSubProjects>false</excludeSubProjects>
                 <excludes>
@@ -263,6 +303,11 @@
                   <exclude>**/*.iws</exclude>
                   <!-- MANIFEST_MF_EXCLUDES -->
                   <exclude>**/MANIFEST.MF</exclude>
+                  <!-- 3RD_PARTY_LICENSES -->
+                  <exclude>distribution/src/main/release/licenses/*</exclude>
+                  <exclude>src/main/release/licenses/*</exclude>
+                  <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48
-->
+                  <exclude>**/dependency-reduced-pom.xml</exclude>
                   <!-- Generated ldif files -->
                   <exclude>ldap-schema/src/main/resources/schema/**</exclude>
                   <exclude>ldap-schema/src/main/resources/schema-all.ldif</exclude>
@@ -315,6 +360,12 @@
       <!-- Project sub-modules dependencies -->
       <dependency>
         <groupId>${project.groupId}</groupId>
+        <artifactId>shared-all</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
         <artifactId>shared-util</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -466,12 +517,6 @@
       </dependency>
 
       <dependency>
-        <groupId>com.mycila</groupId>
-        <artifactId>mycila-junit</artifactId>
-        <version>${mycila-junit.version}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
         <version>${pax-exam.version}</version>
@@ -586,4 +631,38 @@
     <url>http://svn.apache.org/viewvc/directory/shared/trunk</url>
   </scm>
 
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <configuration>
+                  <!-- we have a dedicated distribution module -->
+                  <skipAssembly>true</skipAssembly>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+         </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: directory/shared/branches/m1/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/util/pom.xml?rev=1071139&r1=1071138&r2=1071139&view=diff
==============================================================================
--- directory/shared/branches/m1/util/pom.xml (original)
+++ directory/shared/branches/m1/util/pom.xml Wed Feb 16 04:26:37 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.shared</groupId>
     <artifactId>shared-parent</artifactId>
-    <version>0.9.20-SNAPSHOT</version>
+    <version>1.0.0-M2-SNAPSHOT</version>
   </parent>
   
   <artifactId>shared-util</artifactId>
@@ -39,12 +39,6 @@
     </dependency>
     
     <dependency>
-      <groupId>com.mycila</groupId>
-      <artifactId>mycila-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-i18n</artifactId>
     </dependency> 



Mime
View raw message