You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/05/13 06:27:23 UTC
svn commit: r1337774 - in /karaf/trunk/manual/src/main/webapp:
developers-guide/archetypes.conf developers-guide/custom-distribution.conf
users-guide/deployer.conf users-guide/kar.conf
Author: pieber
Date: Sun May 13 04:27:23 2012
New Revision: 1337774
URL: http://svn.apache.org/viewvc?rev=1337774&view=rev
Log:
[KARAF-1471] Use project.version instead of naming the version directly
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/manual/src/main/webapp/developers-guide/archetypes.conf
karaf/trunk/manual/src/main/webapp/developers-guide/custom-distribution.conf
karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf
karaf/trunk/manual/src/main/webapp/users-guide/kar.conf
Modified: karaf/trunk/manual/src/main/webapp/developers-guide/archetypes.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/archetypes.conf?rev=1337774&r1=1337773&r2=1337774&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/archetypes.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/archetypes.conf Sun May 13 04:27:23 2012
@@ -128,7 +128,7 @@ h3. Result of Maven command execution
[INFO]
[INFO] --- maven-archetype-plugin:2.1:generate (default-cli) @ standalone-pom ---
[INFO] Generating project in Interactive mode
-[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-bundle-archetype:3.0.0-SNAPSHOT] found in catalog local
+[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-bundle-archetype:${project.version}] found in catalog local
[INFO] Using property: groupId = com.mycompany
[INFO] Using property: artifactId = com.mycompany.bundle
[INFO] Using property: version = 1.0-SNAPSHOT
@@ -140,7 +140,7 @@ version: 1.0-SNAPSHOT
package: com.mycompany.package
Y: :
[INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: karaf-bundle-archetype:3.0.0-SNAPSHOT
+[INFO] Using following parameters for creating project from Archetype: karaf-bundle-archetype:${project.version}
[INFO] ----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: com.mycompany
[INFO] Parameter: artifactId, Value: com.mycompany.bundle
@@ -194,7 +194,7 @@ h3. Result of Maven command execution
[INFO]
[INFO] --- maven-archetype-plugin:2.1:generate (default-cli) @ standalone-pom ---
[INFO] Generating project in Interactive mode
-[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-blueprint-archetype:3.0.0-SNAPSHOT] found in catalog local
+[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-blueprint-archetype:${project.version}] found in catalog local
[INFO] Using property: groupId = com.mycompany
[INFO] Using property: artifactId = com.mycompany.blueprint
[INFO] Using property: version = 1.0-SNAPSHOT
@@ -206,7 +206,7 @@ version: 1.0-SNAPSHOT
package: com.mycompany.package
Y: :
[INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: karaf-blueprint-archetype:3.0.0-SNAPSHOT
+[INFO] Using following parameters for creating project from Archetype: karaf-blueprint-archetype:${project.version}
[INFO] ----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: com.mycompany
[INFO] Parameter: artifactId, Value: com.mycompany.blueprint
@@ -260,7 +260,7 @@ h3. Result of maven command execution
[INFO]
[INFO] --- maven-archetype-plugin:2.1:generate (default-cli) @ standalone-pom ---
[INFO] Generating project in Interactive mode
-[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-feature-archetype:3.0.0-SNAPSHOT] found in catalog local
+[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-feature-archetype:${project.version}] found in catalog local
[INFO] Using property: groupId = com.mycompany
[INFO] Using property: artifactId = com.mycompany.feature
[INFO] Using property: version = 1.0-SNAPSHOT
@@ -272,7 +272,7 @@ version: 1.0-SNAPSHOT
package: com.mycompany.package
Y: :
[INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: karaf-feature-archetype:3.0.0-SNAPSHOT
+[INFO] Using following parameters for creating project from Archetype: karaf-feature-archetype:${project.version}
[INFO] ----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: com.mycompany
[INFO] Parameter: artifactId, Value: com.mycompany.feature
@@ -326,7 +326,7 @@ h3. Result of maven command execution
[INFO]
[INFO] --- maven-archetype-plugin:2.1:generate (default-cli) @ standalone-pom ---
[INFO] Generating project in Interactive mode
-[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-kar-archetype:3.0.0-SNAPSHOT] found in catalog local
+[INFO] Archetype repository missing. Using the one from [org.apache.karaf.archetypes:karaf-kar-archetype:${project.version}] found in catalog local
[INFO] Using property: groupId = com.mycompany
[INFO] Using property: artifactId = com.mycompany.kar
[INFO] Using property: version = 1.0-SNAPSHOT
@@ -338,7 +338,7 @@ version: 1.0-SNAPSHOT
package: com.mycompany.package
Y: :
[INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: karaf-kar-archetype:3.0.0-SNAPSHOT
+[INFO] Using following parameters for creating project from Archetype: karaf-kar-archetype:${project.version}
[INFO] ----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: com.mycompany
[INFO] Parameter: artifactId, Value: com.mycompany.kar
Modified: karaf/trunk/manual/src/main/webapp/developers-guide/custom-distribution.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/custom-distribution.conf?rev=1337774&r1=1337773&r2=1337774&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/custom-distribution.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/custom-distribution.conf Sun May 13 04:27:23 2012
@@ -53,7 +53,7 @@ This is the minimal assembly pom changed
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf-minimal</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<packaging>karaf-assembly</packaging>
<name>Apache Karaf :: Assemblies :: Minimal Distribution</name>
Modified: karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf?rev=1337774&r1=1337773&r2=1337774&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf Sun May 13 04:27:23 2012
@@ -103,8 +103,8 @@ Installing bundle mvn:org.ops4j.pax.web/
Installing bundle mvn:org.ops4j.pax.web/pax-web-spi/1.0.0
Installing bundle mvn:org.ops4j.pax.web/pax-web-runtime/1.0.0
Installing bundle mvn:org.ops4j.pax.web/pax-web-jetty/1.0.0
-Installing bundle mvn:org.apache.karaf.web/org.apache.karaf.web.core/3.0.0-SNAPSHOT
-Installing bundle mvn:org.apache.karaf.web/org.apache.karaf.web.commands/3.0.0-SNAPSHOT
+Installing bundle mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}
+Installing bundle mvn:org.apache.karaf.web/org.apache.karaf.web.commands/${project.version}
Installing bundle mvn:org.ops4j.pax.web/pax-web-jsp/1.0.0
Installing bundle mvn:org.ops4j.pax.web/pax-web-extender-war/1.0.0
Installing bundle mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.0
Modified: karaf/trunk/manual/src/main/webapp/users-guide/kar.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/kar.conf?rev=1337774&r1=1337773&r2=1337774&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/kar.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/kar.conf Sun May 13 04:27:23 2012
@@ -43,7 +43,7 @@ For instance, you can use the following
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<executions>
<execution>
<id>features-create-kar</id>