updated some versions

Tcharl · Feb 21, 2013 · aa5dd37 · aa5dd37
1 parent fc41a1c
commit aa5dd37
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 174 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,10 +7,9 @@
 	</parent>
   <groupId>net.osgiliath.framework</groupId>
   <artifactId>virgo-plans</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2</version>
   <packaging>pom</packaging>
   	<properties>
-		<user.osgi.version>0.0.1.SNAPSHOT</user.osgi.version>
 		<virgo.user.repository>${virgo.path}/repository/usr</virgo.user.repository>
 		<virgo.pickup.repository>${virgo.path}/pickup</virgo.pickup.repository>
 	</properties>

diff --git a/virgo-plans.jpa/pom.xml b/virgo-plans.jpa/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.osgiliath.framework</groupId>
 		<artifactId>virgo-plans</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2</version>
 	</parent>
 	<artifactId>virgo-plans.jpa</artifactId>
 	<packaging>jar</packaging>
@@ -116,21 +115,13 @@
 						<phase>install</phase>
 						<configuration>
 							<tasks>
-								<copy
-									file="${project.basedir}/jars/gemini-dbaccess-1.0.0.RELEASE/org.apache.derby_10.5.1.1.jar"
-									tofile="${virgo.user.repository}/org.apache.derby_10.5.1.1.jar" />
-								<copy
-									file="${project.basedir}/jars/gemini-dbaccess-1.0.0.RELEASE/org.eclipse.gemini.dbaccess.derby_1.0.0.RELEASE.jar"
-									tofile="${virgo.user.repository}/org.eclipse.gemini.dbaccess.derby_1.0.0.RELEASE.jar" />
-								<copy
-									file="${project.basedir}/jars/org.eclipse.gemini.jpa-1.1.0.RELEASE.jar"
-									tofile="${virgo.user.repository}/org.eclipse.gemini.jpa-1.1.0.RELEASE.jar" />
-								<!-- 	<copy
-									file="${project.basedir}/jars/org.eclipse.gemini.naming-1.0.1.RELEASE.jar"
+								<copy file="${project.basedir}/jars/gemini-dbaccess-1.0.0.RELEASE/org.apache.derby_10.5.1.1.jar" tofile="${virgo.user.repository}/org.apache.derby_10.5.1.1.jar" />
+								<copy file="${project.basedir}/jars/gemini-dbaccess-1.0.0.RELEASE/org.eclipse.gemini.dbaccess.derby_1.0.0.RELEASE.jar" tofile="${virgo.user.repository}/org.eclipse.gemini.dbaccess.derby_1.0.0.RELEASE.jar" />
+								<copy file="${project.basedir}/jars/org.eclipse.gemini.jpa-1.1.0.RELEASE.jar" tofile="${virgo.user.repository}/org.eclipse.gemini.jpa-1.1.0.RELEASE.jar" />
+								<!-- 	<copy file="${project.basedir}/jars/org.eclipse.gemini.naming-1.0.1.RELEASE.jar"
 									tofile="${virgo.user.repository}/org.eclipse.gemini.naming-1.0.1.RELEASE.jar" /> -->
 
-								<copy file="${project.build.directory}/classes/virgo-plans.jpa.plan"
-									tofile="${virgo.pickup.repository}/virgo-plans.jpa.plan" />
+								<copy file="${project.build.directory}/classes/virgo-plans.jpa.plan" tofile="${virgo.pickup.repository}/virgo-plans.jpa.plan" />
 
 							</tasks>
 						</configuration>

diff --git a/virgo-plans.jpa/template.mf b/virgo-plans.jpa/template.mf
@@ -2,4 +2,4 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ${project.artifactId}
 Bundle-Vendor: Osgiliath Inc.
 Bundle-SymbolicName: ${project.groupId}_${project.artifactId}
-Bundle-Version: ${user.osgi.version}
+Bundle-Version: ${project.version}
diff --git a/virgo-plans.messaging/pom.xml b/virgo-plans.messaging/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.osgiliath.framework</groupId>
 		<artifactId>virgo-plans</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2</version>
 	</parent>
 	<artifactId>virgo-plans.messaging</artifactId>
 	<packaging>jar</packaging>
@@ -30,16 +29,9 @@
 						<phase>install</phase>
 						<configuration>
 							<tasks>
-								<copy
-									file="${project.build.directory}/classes/virgo-plans.messaging.plan"
-									tofile="${virgo.pickup.repository}/virgo-plans.messaging.plan" />
-								<copy
-									file="${project.basedir}/src/main/resources/jmsconfig.properties"
-
-									tofile="${virgo.path}/repository/usr/jmsconfig.properties" />
-								<copy
-									file="${project.basedir}/src/main/resources/websocket-config.properties"
-									tofile="${virgo.path}/repository/usr/websocket-config.properties" />
+								<copy file="${project.build.directory}/classes/virgo-plans.messaging.plan" tofile="${virgo.pickup.repository}/virgo-plans.messaging.plan" />
+								<copy file="${project.basedir}/src/main/resources/jmsconfig.properties" tofile="${virgo.path}/repository/usr/jmsconfig.properties" />
+								<copy file="${project.basedir}/src/main/resources/websocket-config.properties" tofile="${virgo.path}/repository/usr/websocket-config.properties" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -76,32 +68,16 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.osgiliath.framework</groupId>
-									<version>0.0.1-SNAPSHOT</version>
-									<artifactId>framework.middleware.jms.camel</artifactId>
+									<version>${osgiliath.helpers.version}</version>
+									<artifactId>helpers.activemq.jms.connectionfactory.exporter</artifactId>
 									<overWrite>false</overWrite>
 									<type>jar</type>
 									<outputDirectory>${virgo.path}/repository/usr</outputDirectory>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.osgiliath.framework</groupId>
-									<artifactId>framework.middleware.jms.connectionfactory.exporter</artifactId>
-									<version>0.0.1-SNAPSHOT</version>
-									<overWrite>false</overWrite>
-									<type>jar</type>
-									<outputDirectory>${virgo.path}/repository/usr</outputDirectory>
-								</artifactItem>
-								<artifactItem>
-									<groupId>net.osgiliath.framework</groupId>
-									<version>0.0.1-SNAPSHOT</version>
-									<artifactId>framework.middleware.websock.camel</artifactId>
-									<overWrite>false</overWrite>
-									<type>jar</type>
-									<outputDirectory>${virgo.path}/repository/usr</outputDirectory>
-								</artifactItem>
-								<artifactItem>
-									<groupId>net.osgiliath.framework</groupId>
-									<artifactId>framework.middleware.websock.connectionfactory</artifactId>
-									<version>0.0.1-SNAPSHOT</version>
+									<version>${osgiliath.helpers.version}</version>
+									<artifactId>helpers.activemq.websocket.connectionfactory.exporter</artifactId>
 									<overWrite>false</overWrite>
 									<type>jar</type>
 									<outputDirectory>${virgo.path}/repository/usr</outputDirectory>
@@ -353,19 +329,15 @@
 		</dependency>
 		<dependency>
 			<groupId>net.osgiliath.framework</groupId>
-			<version>0.0.1-SNAPSHOT</version>
-			<artifactId>framework.middleware.jms.camel</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.osgiliath.framework</groupId>
-			<artifactId>framework.middleware.jms.connectionfactory.exporter</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${osgiliath.helpers.version}</version>
+			<artifactId>helpers.activemq.jms.connectionfactory.exporter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>net.osgiliath.framework</groupId>
-			<artifactId>framework.middleware.websock.connectionfactory</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<artifactId>helpers.activemq.websocket.connectionfactory.exporter</artifactId>
+			<version>${osgiliath.helpers.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-camel</artifactId>

diff --git a/virgo-plans.messaging/src/main/resources/virgo-plans.messaging.plan b/virgo-plans.messaging/src/main/resources/virgo-plans.messaging.plan
@@ -15,7 +15,7 @@
 	<artifact name="jackson-core-asl" type="bundle" version="${jackson-core-asl.version}"></artifact>
 	<artifact name="jackson-mapper-asl" type="bundle" version="${jackson-core-asl.version}"></artifact>
 	<artifact name="jmsconfig" type="configuration" version="0"></artifact>
-	<artifact name="net.osgiliath.framework_framework.middleware.jms.connectionfactory.exporter" type="bundle" version="[0,1)"></artifact>
+	<!-- <artifact name="net.osgiliath.framework_framework.middleware.jms.connectionfactory.exporter" type="bundle" version="[0,1)"></artifact> -->
 	<artifact name="org.apache.camel.camel-core" version="${camel-version}" type="bundle"></artifact>
 	<artifact name="org.apache.camel.camel-core-osgi" version="${camel-version}" type="bundle"></artifact>
 	<artifact name="org.apache.camel.camel-jackson" version="${camel-version}" type="bundle"></artifact>
@@ -38,7 +38,7 @@
 	<artifact name="org.apache.camel.camel-websocket" version="${camel-version}" type="bundle"></artifact>
 	<artifact name="org.apache.activemq.activemq-camel" type="bundle" version="${org.apache.activemq.version}"></artifact>
 	<!-- TODO let's see how I can correct (maybe amq-jaas dep)<artifact name="net.osgiliath.framework_framework.middleware.websock.connectionfactory" version="[0, 1)" type="bundle"></artifact>
-	 --><artifact name="net.osgiliath.framework_framework.middleware.jms.camel" type="bundle" version="[0, 1)"></artifact>
+	 --><artifact name="net.osgiliath.framework_helpers.activemq.jms.connectionfactory.exporter" type="bundle" version="${osgiliath.helpers.version}"></artifact>
 	<artifact name="org.apache.servicemix.bundles.jdom" type="bundle" version="[1, 2)"></artifact>
 	<artifact name="org.apache.servicemix.bundles.jdom" type="bundle" version="[2,3)"></artifact>
 

diff --git a/virgo-plans.messaging/template.mf b/virgo-plans.messaging/template.mf
@@ -2,4 +2,4 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ${project.artifactId}
 Bundle-Vendor: Osgiliath Inc.
 Bundle-SymbolicName: ${project.groupId}_${project.artifactId}
-Bundle-Version: ${user.osgi.version}
+Bundle-Version: ${project.version}
diff --git a/virgo-plans.security/pom.xml b/virgo-plans.security/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.osgiliath.framework</groupId>
     <artifactId>virgo-plans</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2</version>
   </parent>
   <artifactId>virgo-plans.security</artifactId>
   <packaging>jar</packaging>
@@ -29,9 +29,7 @@
 						<phase>install</phase>
 						<configuration>
 							<tasks>
-								<copy
-									file="${project.build.directory}/classes/virgo-plans.security.plan"
-									tofile="${virgo.pickup.repository}/virgo-plans.security.plan" />
+								<copy file="${project.build.directory}/classes/virgo-plans.security.plan" tofile="${virgo.pickup.repository}/virgo-plans.security.plan" />
 							</tasks>
 						</configuration>
 						<goals>

diff --git a/virgo-plans.security/template.mf b/virgo-plans.security/template.mf
@@ -2,4 +2,4 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ${project.artifactId}
 Bundle-Vendor: Osgiliath Inc.
 Bundle-SymbolicName: ${project.groupId}_${project.artifactId}
-Bundle-Version: ${user.osgi.version}
+Bundle-Version: ${project.version}
diff --git a/virgo-plans.utils/pom.xml b/virgo-plans.utils/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.osgiliath.framework</groupId>
     <artifactId>virgo-plans</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2</version>
   </parent>
   <artifactId>virgo-plans.utils</artifactId>
   <packaging>jar</packaging>
@@ -29,9 +29,7 @@
 						<phase>install</phase>
 						<configuration>
 							<tasks>
-								<copy
-									file="${project.build.directory}/classes/virgo-plans.utils.plan"
-									tofile="${virgo.pickup.repository}/virgo-plans.utils.plan" />
+								<copy file="${project.build.directory}/classes/virgo-plans.utils.plan" tofile="${virgo.pickup.repository}/virgo-plans.utils.plan" />
 							</tasks>
 						</configuration>
 						<goals>

diff --git a/virgo-plans.utils/template.mf b/virgo-plans.utils/template.mf
@@ -2,4 +2,4 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ${project.artifactId}
 Bundle-Vendor: Osgiliath Inc.
 Bundle-SymbolicName: ${project.groupId}_${project.artifactId}
-Bundle-Version: ${user.osgi.version}
+Bundle-Version: ${project.version}