directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r887167 - in /directory/studio/trunk: ./ aciitemeditor/ apacheds-configuration-feature/ apacheds-configuration-help/ apacheds-configuration-help/src/main/docbook/ apacheds-configuration/ apacheds-feature/ apacheds-help/ apacheds-help/src/ma...
Date Fri, 04 Dec 2009 12:11:50 GMT
Author: pamarcelot
Date: Fri Dec  4 12:11:49 2009
New Revision: 887167

URL: http://svn.apache.org/viewvc?rev=887167&view=rev
Log:
Removed specific version properties (replaced by ${pom.version} taken from the parent pom) (except for the apacheds-launcher library project)

Modified:
    directory/studio/trunk/aciitemeditor/pom.xml
    directory/studio/trunk/apacheds-configuration-feature/feature.xml
    directory/studio/trunk/apacheds-configuration-feature/pom.xml
    directory/studio/trunk/apacheds-configuration-help/pom.xml
    directory/studio/trunk/apacheds-configuration-help/src/main/docbook/0_index.xml
    directory/studio/trunk/apacheds-configuration/pom.xml
    directory/studio/trunk/apacheds-feature/feature.xml
    directory/studio/trunk/apacheds-feature/pom.xml
    directory/studio/trunk/apacheds-help/pom.xml
    directory/studio/trunk/apacheds-help/src/main/docbook/0_index.xml
    directory/studio/trunk/apacheds-launcher/pom.xml
    directory/studio/trunk/apacheds/pom.xml
    directory/studio/trunk/common-ui/pom.xml
    directory/studio/trunk/connection-core/pom.xml
    directory/studio/trunk/connection-ui/pom.xml
    directory/studio/trunk/jars/pom.xml
    directory/studio/trunk/ldapbrowser-common/pom.xml
    directory/studio/trunk/ldapbrowser-core/pom.xml
    directory/studio/trunk/ldapbrowser-feature/feature.xml
    directory/studio/trunk/ldapbrowser-feature/pom.xml
    directory/studio/trunk/ldapbrowser-help/pom.xml
    directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml
    directory/studio/trunk/ldapbrowser-ui/pom.xml
    directory/studio/trunk/ldif-parser/pom.xml
    directory/studio/trunk/ldifeditor-feature/feature.xml
    directory/studio/trunk/ldifeditor-feature/pom.xml
    directory/studio/trunk/ldifeditor-help/pom.xml
    directory/studio/trunk/ldifeditor-help/src/main/docbook/0_index.xml
    directory/studio/trunk/ldifeditor/pom.xml
    directory/studio/trunk/pom.xml
    directory/studio/trunk/rcp-feature/feature.xml
    directory/studio/trunk/rcp-feature/pom.xml
    directory/studio/trunk/rcp-help/pom.xml
    directory/studio/trunk/rcp-help/src/main/docbook/0_index.xml
    directory/studio/trunk/rcp/pom.xml
    directory/studio/trunk/repository/pom.xml
    directory/studio/trunk/schemaeditor-feature/feature.xml
    directory/studio/trunk/schemaeditor-feature/pom.xml
    directory/studio/trunk/schemaeditor-help/pom.xml
    directory/studio/trunk/schemaeditor-help/src/main/docbook/0_index.xml
    directory/studio/trunk/schemaeditor/pom.xml
    directory/studio/trunk/test-integration-core/pom.xml
    directory/studio/trunk/test-integration-ui/pom.xml
    directory/studio/trunk/updatesite/pom.xml
    directory/studio/trunk/updatesite/src/main/resources/site--xml.html
    directory/studio/trunk/updatesite/src/main/resources/site.xml
    directory/studio/trunk/valueeditors/pom.xml

Modified: directory/studio/trunk/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/aciitemeditor/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>aciitemeditor</artifactId>
-  <version>${aciitemeditor.version}</version>
   <name>Apache Directory Studio ACI Item Editor</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/apacheds-configuration-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration-feature/feature.xml (original)
+++ directory/studio/trunk/apacheds-configuration-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -224,28 +224,28 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.configuration"
          download-size="0"
          install-size="0"
-         version="${apacheds.configuration.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.jars"
          download-size="0"
          install-size="0"
-         version="${jars.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.configuration.help"
          download-size="0"
          install-size="0"
-         version="${apacheds.configuration.help.version}"
+         version="${pom.version}"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/apacheds-configuration-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration-feature/pom.xml (original)
+++ directory/studio/trunk/apacheds-configuration-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>apacheds.configuration.feature</artifactId>
-  <version>${apacheds.configuration.feature.version}</version>
   <name>Apache Directory Studio Apache DS Configuration Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/apacheds-configuration-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration-help/pom.xml (original)
+++ directory/studio/trunk/apacheds-configuration-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>apacheds.configuration.help</artifactId>
-  <version>${apacheds.configuration.help.version}</version>
   <name>Apache Directory Studio Apache DS Configuration Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/apacheds-configuration-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/apacheds-configuration-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -61,7 +61,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio Apache DS Configuration</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/pom.xml (original)
+++ directory/studio/trunk/apacheds-configuration/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>apacheds.configuration</artifactId>
-  <version>${apacheds.configuration.version}</version>
   <name>Apache Directory Studio Apache DS Configuration</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/apacheds-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-feature/feature.xml (original)
+++ directory/studio/trunk/apacheds-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -224,35 +224,35 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.configuration"
          download-size="0"
          install-size="0"
-         version="${apacheds.configuration.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds"
          download-size="0"
          install-size="0"
-         version="${apacheds.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.jars"
          download-size="0"
          install-size="0"
-         version="${jars.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.apacheds.help"
          download-size="0"
          install-size="0"
-         version="${apacheds.help.version}"
+         version="${pom.version}"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/apacheds-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-feature/pom.xml (original)
+++ directory/studio/trunk/apacheds-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>apacheds.feature</artifactId>
-  <version>${apacheds.feature.version}</version>
   <name>Apache Directory Studio Apache DS Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/apacheds-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-help/pom.xml (original)
+++ directory/studio/trunk/apacheds-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>apacheds.help</artifactId>
-  <version>${apacheds.help.version}</version>
   <name>Apache Directory Studio Apache DS Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/apacheds-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/apacheds-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -42,7 +42,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio Apache DS</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/apacheds-launcher/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-launcher/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-launcher/pom.xml (original)
+++ directory/studio/trunk/apacheds-launcher/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>apacheds-launcher</artifactId>
-	<version>${apacheds.launcher.version}</version>
+    <version>${apacheds.launcher.version}</version>
 	<name>Apache Directory Studio Apache DS Launcher</name>
 	<packaging>jar</packaging>
 
@@ -54,16 +54,6 @@
 					</projectnatures>
 				</configuration>
 			</plugin>
-			<!-- <!> <!> <!> WARNING <!> <!> <!> -->
-			<!-- The following plugin configuration needs to be removed before the next release. -->
-			<!-- It has only been added to please the continuum deployment. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-				    <skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 

Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>apacheds</artifactId>
-  <version>${apacheds.version}</version>
   <name>Apache Directory Studio Apache DS</name>
   <packaging>jar</packaging>
 
@@ -721,7 +720,7 @@
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
                   <artifactId>apacheds-launcher</artifactId>
-                  <version>${apacheds.launcher.version}</version>
+                  <version>1.5.0</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>

Modified: directory/studio/trunk/common-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common-ui/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/common-ui/pom.xml (original)
+++ directory/studio/trunk/common-ui/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>common.ui</artifactId>
-  <version>${common.ui.version}</version>
   <name>Apache Directory Studio Common UI</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/pom.xml (original)
+++ directory/studio/trunk/connection-core/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>connection.core</artifactId>
-  <version>${connection.core.version}</version>
   <name>Apache Directory Studio Connection Core</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/pom.xml (original)
+++ directory/studio/trunk/connection-ui/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>connection.ui</artifactId>
-  <version>${connection.ui.version}</version>
   <name>Apache Directory Studio Connection UI</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/jars/pom.xml (original)
+++ directory/studio/trunk/jars/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>jars</artifactId>
-  <version>${jars.version}</version>
   <name>Apache Directory Studio Jars</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldapbrowser-common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-common/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>ldapbrowser.common</artifactId>
-  <version>${ldapbrowser.common.version}</version>
   <name>Apache Directory Studio LDAP Browser Common</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-core/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>ldapbrowser.core</artifactId>
-  <version>${ldapbrowser.core.version}</version>
   <name>Apache Directory Studio LDAP Browser Core</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldapbrowser-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-feature/feature.xml (original)
+++ directory/studio/trunk/ldapbrowser-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -236,84 +236,84 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.core"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.core.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.ui"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.help"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.help.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.jars"
          download-size="0"
          install-size="0"
-         version="${jars.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.common"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.common.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.valueeditors"
          download-size="0"
          install-size="0"
-         version="${valueeditors.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor"
          download-size="0"
          install-size="0"
-         version="${ldifeditor.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifparser"
          download-size="0"
          install-size="0"
-         version="${ldifparser.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.aciitemeditor"
          download-size="0"
          install-size="0"
-         version="${aciitemeditor.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
-         version="${connection.core.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
-         version="${connection.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/ldapbrowser-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-feature/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>ldapbrowser.feature</artifactId>
-  <version>${ldapbrowser.feature.version}</version>
   <name>Apache Directory Studio LDAP Browser Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldapbrowser-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>ldapbrowser.help</artifactId>
-  <version>${ldapbrowser.help.version}</version>
   <name>Apache Directory Studio LDAP Browser Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/ldapbrowser-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -103,7 +103,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio LDAP Browser</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/ldapbrowser-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-ui/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>ldapbrowser.ui</artifactId>
-  <version>${ldapbrowser.ui.version}</version>
   <name>Apache Directory Studio LDAP Browser UI</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldif-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldif-parser/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldif-parser/pom.xml (original)
+++ directory/studio/trunk/ldif-parser/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>ldifparser</artifactId>
-  <version>${ldifparser.version}</version>
   <name>Apache Directory Studio LDIF Parser</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldifeditor-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor-feature/feature.xml (original)
+++ directory/studio/trunk/ldifeditor-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -223,75 +223,75 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.aciitemeditor"
          download-size="0"
          install-size="0"
-         version="${aciitemeditor.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
-         version="${connection.core.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
-         version="${connection.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.jars"
          download-size="0"
          install-size="0"
-         version="${jars.version}"/>
+         version="${pom.version}"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.core"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.core.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor"
          download-size="0"
          install-size="0"
-         version="${ldifeditor.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifparser"
          download-size="0"
          install-size="0"
-         version="${ldifparser.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.valueeditors"
          download-size="0"
          install-size="0"
-         version="${valueeditors.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldapbrowser.common"
          download-size="0"
          install-size="0"
-         version="${ldapbrowser.common.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifeditor.help"
          download-size="0"
          install-size="0"
-         version="${ldifeditor.help.version}"/>
+         version="${pom.version}"/>
 
 </feature>

Modified: directory/studio/trunk/ldifeditor-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor-feature/pom.xml (original)
+++ directory/studio/trunk/ldifeditor-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>ldifeditor.feature</artifactId>
-  <version>${ldifeditor.feature.version}</version>
   <name>Apache Directory Studio LDIF Editor Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/ldifeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor-help/pom.xml (original)
+++ directory/studio/trunk/ldifeditor-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>ldifeditor.help</artifactId>
-  <version>${ldifeditor.help.version}</version>
   <name>Apache Directory Studio LDIF Editor Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/ldifeditor-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/ldifeditor-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -33,7 +33,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio LDIF Editor</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>ldifeditor</artifactId>
-  <version>${ldifeditor.version}</version>
   <name>Apache Directory Studio LDIF Editor</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Fri Dec  4 12:11:49 2009
@@ -65,39 +65,8 @@
     -->
     <studio.dist.url>${pom.distributionManagement.repository.url}</studio.dist.url>
     <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/studio/gen-docs/${version}</distMgmtSiteUrl>
-    <!-- Set versions for subprojects -->
-    <aciitemeditor.version>1.5.2-SNAPSHOT</aciitemeditor.version>
-    <apacheds.launcher.version>1.5.2-SNAPSHOT</apacheds.launcher.version>
-    <apacheds.version>1.5.2-SNAPSHOT</apacheds.version>
-    <apacheds.feature.version>1.5.2-SNAPSHOT</apacheds.feature.version>
-    <apacheds.help.version>1.5.2-SNAPSHOT</apacheds.help.version>
-    <apacheds.configuration.version>1.5.2-SNAPSHOT</apacheds.configuration.version>
-    <apacheds.configuration.feature.version>1.5.2-SNAPSHOT</apacheds.configuration.feature.version>
-    <apacheds.configuration.help.version>1.5.2-SNAPSHOT</apacheds.configuration.help.version>
-    <common.ui.version>1.5.2-SNAPSHOT</common.ui.version>
-    <connection.core.version>1.5.2-SNAPSHOT</connection.core.version>
-    <connection.ui.version>1.5.2-SNAPSHOT</connection.ui.version>
-    <jars.version>1.5.2-SNAPSHOT</jars.version>
-    <ldapbrowser.common.version>1.5.2-SNAPSHOT</ldapbrowser.common.version>
-    <ldapbrowser.core.version>1.5.2-SNAPSHOT</ldapbrowser.core.version>
-    <ldapbrowser.feature.version>1.5.2-SNAPSHOT</ldapbrowser.feature.version>
-    <ldapbrowser.help.version>1.5.2-SNAPSHOT</ldapbrowser.help.version>
-    <ldapbrowser.ui.version>1.5.2-SNAPSHOT</ldapbrowser.ui.version>
-    <ldifeditor.version>1.5.2-SNAPSHOT</ldifeditor.version>
-    <ldifeditor.feature.version>1.5.2-SNAPSHOT</ldifeditor.feature.version>
-    <ldifeditor.help.version>1.5.2-SNAPSHOT</ldifeditor.help.version>
-    <ldifparser.version>1.5.2-SNAPSHOT</ldifparser.version>
-    <rcp.version>1.5.2-SNAPSHOT</rcp.version>
-    <rcp.feature.version>1.5.2-SNAPSHOT</rcp.feature.version>
-    <rcp.help.version>1.5.2-SNAPSHOT</rcp.help.version>
-    <repository.version>1.5.2-SNAPSHOT</repository.version>
-    <schemaeditor.version>1.5.2-SNAPSHOT</schemaeditor.version>
-    <schemaeditor.feature.version>1.5.2-SNAPSHOT</schemaeditor.feature.version>
-    <schemaeditor.help.version>1.5.2-SNAPSHOT</schemaeditor.help.version>
-    <test.integration.core.version>1.5.2-SNAPSHOT</test.integration.core.version>
-    <test.integration.ui.version>1.5.2-SNAPSHOT</test.integration.ui.version>
-    <updatesite.version>1.5.1-SNAPSHOT</updatesite.version>
-    <valueeditors.version>1.5.2-SNAPSHOT</valueeditors.version>
+    
+    <apacheds.launcher.version>1.5.0</apacheds.launcher.version>
 
     <!-- Set versions for depending projects -->
     <org.apache.directory.shared.version>0.9.16</org.apache.directory.shared.version>
@@ -197,157 +166,157 @@
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>aciitemeditor</artifactId>
-        <version>${aciitemeditor.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds</artifactId>
-        <version>${apacheds.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.feature</artifactId>
-        <version>${apacheds.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.help</artifactId>
-        <version>${apacheds.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds-launcher</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>${apacheds.launcher.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.configuration</artifactId>
-        <version>${apacheds.configuration.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.configuration.feature</artifactId>
-        <version>${apacheds.configuration.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>apacheds.configuration.help</artifactId>
-        <version>${apacheds.configuration.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>common.ui</artifactId>
-        <version>${common.ui.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>connection.core</artifactId>
-        <version>${connection.core.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>connection.ui</artifactId>
-        <version>${connection.ui.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>jars</artifactId>
-        <version>${jars.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.common</artifactId>
-        <version>${ldapbrowser.common.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.core</artifactId>
-        <version>${ldapbrowser.core.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.feature</artifactId>
-        <version>${ldapbrowser.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.help</artifactId>
-        <version>${ldapbrowser.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.ui</artifactId>
-        <version>${ldapbrowser.ui.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldifeditor</artifactId>
-        <version>${ldifeditor.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldifeditor.feature</artifactId>
-        <version>${ldifeditor.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldifeditor.help</artifactId>
-        <version>${ldifeditor.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldifparser</artifactId>
-        <version>${ldifparser.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>rcp</artifactId>
-        <version>${rcp.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>rcp.feature</artifactId>
-        <version>${rcp.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>rcp.help</artifactId>
-        <version>${rcp.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>schemaeditor</artifactId>
-        <version>${schemaeditor.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>schemaeditor.feature</artifactId>
-        <version>${schemaeditor.feature.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>schemaeditor.help</artifactId>
-        <version>${schemaeditor.help.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>test.integration.core</artifactId>
-        <version>${test.integration.core.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>test.integration.ui</artifactId>
-        <version>${test.integration.ui.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>updatesite</artifactId>
-        <version>${updatesite.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>valueeditors</artifactId>
-        <version>${valueeditors.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       
       <!-- Maven -->

Modified: directory/studio/trunk/rcp-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/rcp-feature/feature.xml (original)
+++ directory/studio/trunk/rcp-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -228,21 +228,21 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.rcp"
          download-size="0"
          install-size="0"
-         version="${rcp.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.rcp.help"
          download-size="0"
          install-size="0"
-         version="${rcp.help.version}"
+         version="${pom.version}"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/rcp-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/rcp-feature/pom.xml (original)
+++ directory/studio/trunk/rcp-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>rcp.feature</artifactId>
-  <version>${rcp.feature.version}</version>
   <name>Apache Directory Studio RCP Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/rcp-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/rcp-help/pom.xml (original)
+++ directory/studio/trunk/rcp-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>rcp.help</artifactId>
-  <version>${rcp.help.version}</version>
   <name>Apache Directory Studio RCP Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/rcp-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/rcp-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/rcp-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -45,7 +45,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/rcp/pom.xml (original)
+++ directory/studio/trunk/rcp/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>rcp</artifactId>
-  <version>${rcp.version}</version>
   <name>Apache Directory Studio RCP</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/repository/pom.xml (original)
+++ directory/studio/trunk/repository/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>repository</artifactId>
-  <version>${repository.version}</version>
   <name>Apache Directory Studio Repository</name>
   <packaging>pom</packaging>
   

Modified: directory/studio/trunk/schemaeditor-feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor-feature/feature.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor-feature/feature.xml (original)
+++ directory/studio/trunk/schemaeditor-feature/feature.xml Fri Dec  4 12:11:49 2009
@@ -224,49 +224,49 @@
          id="org.apache.directory.studio.common.ui"
          download-size="0"
          install-size="0"
-         version="${common.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.schemaeditor"
          download-size="0"
          install-size="0"
-         version="${schemaeditor.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.schemaeditor.help"
          download-size="0"
          install-size="0"
-         version="${schemaeditor.help.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.jars"
          download-size="0"
          install-size="0"
-         version="${jars.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.core"
          download-size="0"
          install-size="0"
-         version="${connection.core.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.connection.ui"
          download-size="0"
          install-size="0"
-         version="${connection.ui.version}"
+         version="${pom.version}"
          unpack="false"/>
 
    <plugin
          id="org.apache.directory.studio.ldifparser"
          download-size="0"
          install-size="0"
-         version="${ldifparser.version}"
+         version="${pom.version}"
          unpack="false"/>
 
 </feature>

Modified: directory/studio/trunk/schemaeditor-feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor-feature/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor-feature/pom.xml (original)
+++ directory/studio/trunk/schemaeditor-feature/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>schemaeditor.feature</artifactId>
-  <version>${schemaeditor.feature.version}</version>
   <name>Apache Directory Studio Schema Editor Feature</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/schemaeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor-help/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor-help/pom.xml (original)
+++ directory/studio/trunk/schemaeditor-help/pom.xml Fri Dec  4 12:11:49 2009
@@ -28,16 +28,11 @@
   </parent>
 
   <artifactId>schemaeditor.help</artifactId>
-  <version>${schemaeditor.help.version}</version>
   <name>Apache Directory Studio Schema Editor Help</name>
   <packaging>jar</packaging>
 
   <description />
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

Modified: directory/studio/trunk/schemaeditor-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor-help/src/main/docbook/0_index.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor-help/src/main/docbook/0_index.xml (original)
+++ directory/studio/trunk/schemaeditor-help/src/main/docbook/0_index.xml Fri Dec  4 12:11:49 2009
@@ -60,7 +60,7 @@
 	<bookinfo>
 		<title>Apache Directory Studio Schema Editor</title>
 		<subtitle>User's Guide</subtitle>
-		<releaseinfo>Version ${current_pom_version}</releaseinfo>
+		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
 			<year>2006 - 2009</year>
 			<holder>Apache Software Foundation</holder>

Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>schemaeditor</artifactId>
-  <version>${schemaeditor.version}</version>
   <name>Apache Directory Studio Schema Editor</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/pom.xml (original)
+++ directory/studio/trunk/test-integration-core/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>test.integration.core</artifactId>
-  <version>${test.integration.core.version}</version>
   <name>Apache Directory Studio Core Integration Tests</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>test.integration.ui</artifactId>
-  <version>${test.integration.ui.version}</version>
   <name>Apache Directory Studio UI Integration Tests</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/trunk/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/updatesite/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/updatesite/pom.xml (original)
+++ directory/studio/trunk/updatesite/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,17 +27,11 @@
   </parent>
 
   <artifactId>updatesite</artifactId>
-  <version>${updatesite.version}</version>
   <name>Apache Directory Studio Update Site</name>
   <packaging>pom</packaging>
 
   <description></description>
 
-  <properties>
-    <current_pom_version>${pom.version}</current_pom_version>
-    <local-repo>${project.basedir}/../repository</local-repo>
-  </properties>
-
   <profiles>
     <profile>
       <id>CI</id>

Modified: directory/studio/trunk/updatesite/src/main/resources/site--xml.html
URL: http://svn.apache.org/viewvc/directory/studio/trunk/updatesite/src/main/resources/site--xml.html?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/updatesite/src/main/resources/site--xml.html (original)
+++ directory/studio/trunk/updatesite/src/main/resources/site--xml.html Fri Dec  4 12:11:49 2009
@@ -22,98 +22,98 @@
       The Apache Directory Studio update site.
    </description>
    <feature 
-   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.rcp.feature_${rcp.feature.version}.jar" 
-   		id="org.apache.directory.studio.rcp.feature" version="${rcp.feature.version}"
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.rcp.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
    		os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
       <category name="Apache Directory Studio RCP"/>
    </feature>
    <feature 
-   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldapbrowser.feature_${ldapbrowser.feature.version}.jar" 
-   		id="org.apache.directory.studio.ldapbrowser.feature" version="${ldapbrowser.feature.version}">
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.ldapbrowser.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDAP Browser"/>
    </feature>
    <feature 
-   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.schemaeditor.feature_${schemaeditor.feature.version}.jar" 
-   		id="org.apache.directory.studio.schemaeditor.feature" version="${schemaeditor.feature.version}">
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.schemaeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio Schema Editor"/>
    </feature>
    <feature 
-   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.configuration.feature_${apacheds.configuration.feature.version}.jar" 
-   		id="org.apache.directory.studio.apacheds.configuration.feature" version="${apacheds.configuration.feature.version}">
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
       <category name="Apache Directory Studio Apache DS"/>
    </feature>
    <feature 
-   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.feature_${apacheds.feature.version}.jar" 
-   		id="org.apache.directory.studio.apacheds.feature" version="${apacheds.feature.version}">
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
       <category name="Apache Directory Studio Apache DS"/>
    </feature>
-   <feature url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldifeditor.feature_${ldifeditor.feature.version}.jar"
-       id="org.apache.directory.studio.ldifeditor.feature" version="${ldifeditor.feature.version}">
+   <feature url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDIF Editor"/>
    </feature>
    <archive 
-   		path="plugins/org.apache.directory.studio.aciitemeditor_${aciitemeditor.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.aciitemeditor_${aciitemeditor.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.apacheds.configuration.help_${apacheds.configuration.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration.help_${apacheds.configuration.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.apacheds.configuration_${apacheds.configuration.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration_${apacheds.configuration.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.apacheds_${apacheds.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds_${apacheds.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.apacheds_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.apacheds.help_${apacheds.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.help_${apacheds.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar"/>
    <archive
-   		path="plugins/org.apache.directory.studio.common.ui_${common.ui.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.common.ui_${common.ui.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.common.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.common.ui_${pom.version}.jar"/>
    <archive
-   		path="plugins/org.apache.directory.studio.connection.core_${connection.core.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.core_${connection.core.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.connection.core_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.core_${pom.version}.jar"/>
    <archive
-   		path="plugins/org.apache.directory.studio.connection.ui_${connection.ui.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.ui_${connection.ui.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar"/>
    <archive
-   		path="plugins/org.apache.directory.studio.ldapbrowser.common_${ldapbrowser.common.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.common_${ldapbrowser.common.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldapbrowser.core_${ldapbrowser.core.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.core_${ldapbrowser.core.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldapbrowser.help_${ldapbrowser.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.help_${ldapbrowser.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldapbrowser.ui_${ldapbrowser.ui.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.ui_${ldapbrowser.ui.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.rcp.help_${rcp.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp.help_${rcp.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.jars_${jars.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.jars_${jars.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.jars_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.jars_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldifeditor_${ldifeditor.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor_${ldifeditor.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldifeditor.help_${ldifeditor.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor.help_${ldifeditor.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.ldifparser_${ldifparser.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifparser_${ldifparser.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.schemaeditor.help_${schemaeditor.help.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor.help_${schemaeditor.help.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.schemaeditor_${schemaeditor.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor_${schemaeditor.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.valueeditors_${valueeditors.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.valueeditors_${valueeditors.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar"/>
    <archive 
-   		path="plugins/org.apache.directory.studio.rcp_${rcp.version}.jar" 
-   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp_${rcp.version}.jar"/>
+   		path="plugins/org.apache.directory.studio.rcp_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp_${pom.version}.jar"/>
    <category-def name="Apache Directory Studio RCP" label="Apache Directory Studio RCP">
       <description>
          The Apache Directory Studio RCP category contains all features related to the RCP Application.

Modified: directory/studio/trunk/updatesite/src/main/resources/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/updatesite/src/main/resources/site.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/updatesite/src/main/resources/site.xml (original)
+++ directory/studio/trunk/updatesite/src/main/resources/site.xml Fri Dec  4 12:11:49 2009
@@ -4,30 +4,30 @@
       The Apache Directory Studio update site.
    </description>
    <feature
-       url="features/org.apache.directory.studio.rcp.feature_${rcp.feature.version}.jar"
-       id="org.apache.directory.studio.rcp.feature" version="${rcp.feature.version}"
+       url="features/org.apache.directory.studio.rcp.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
        os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
       <category name="Apache Directory Studio RCP"/>
    </feature>
    <feature
-       url="features/org.apache.directory.studio.ldapbrowser.feature_${ldapbrowser.feature.version}.jar"
-       id="org.apache.directory.studio.ldapbrowser.feature" version="${ldapbrowser.feature.version}">
+       url="features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldapbrowser.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDAP Browser"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.schemaeditor.feature_${schemaeditor.feature.version}.jar"
-       id="org.apache.directory.studio.schemaeditor.feature" version="${schemaeditor.feature.version}">
+   <feature url="features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.schemaeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio Schema Editor"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.apacheds.configuration.feature_${apacheds.configuration.feature.version}.jar"
-       id="org.apache.directory.studio.apacheds.configuration.feature" version="${apacheds.configuration.feature.version}">
+   <feature url="features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
       <category name="Apache Directory Studio Apache DS"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.apacheds.feature_${apacheds.feature.version}.jar"
-       id="org.apache.directory.studio.apacheds.feature" version="${apacheds.feature.version}">
+   <feature url="features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
       <category name="Apache Directory Studio Apache DS"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.ldifeditor.feature_${ldifeditor.feature.version}.jar"
-       id="org.apache.directory.studio.ldifeditor.feature" version="${ldifeditor.feature.version}">
+   <feature url="features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
       <category name="Apache Directory Studio LDIF Editor"/>
    </feature>
    <category-def name="Apache Directory Studio RCP" label="Apache Directory Studio RCP">

Modified: directory/studio/trunk/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/pom.xml?rev=887167&r1=887166&r2=887167&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/pom.xml (original)
+++ directory/studio/trunk/valueeditors/pom.xml Fri Dec  4 12:11:49 2009
@@ -27,7 +27,6 @@
   </parent>
   
   <artifactId>valueeditors</artifactId>
-  <version>${valueeditors.version}</version>
   <name>Apache Directory Studio Value Editors</name>
   <packaging>jar</packaging>
 



Mime
View raw message