Revision: 1907
Author: [email protected]
Date: Thu Jun 17 06:05:03 2010
Log: Version number adjusted to first rc (0.2.4-rc1) and changed pom &
config of doapcreator widget so that the widget will carry the same version
number as the rest of the application.
http://code.google.com/p/simal/source/detail?r=1907
Modified:
/branches/0.2.4/uk.ac.osswatch.simal.core/pom.xml
/branches/0.2.4/uk.ac.osswatch.simal.core/src/main/resources/default.simal.properties
/branches/0.2.4/uk.ac.osswatch.simal.rest/pom.xml
/branches/0.2.4/uk.ac.osswatch.simal.web/pom.xml
/branches/0.2.4/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/config.xml
=======================================
--- /branches/0.2.4/uk.ac.osswatch.simal.core/pom.xml Fri Jun 11 11:04:19
2010
+++ /branches/0.2.4/uk.ac.osswatch.simal.core/pom.xml Thu Jun 17 06:05:03
2010
@@ -26,7 +26,7 @@
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-core</artifactId>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
<packaging>jar</packaging>
<name>Simal core</name>
=======================================
---
/branches/0.2.4/uk.ac.osswatch.simal.core/src/main/resources/default.simal.properties
Fri Jun 11 11:04:19 2010
+++
/branches/0.2.4/uk.ac.osswatch.simal.core/src/main/resources/default.simal.properties
Thu Jun 17 06:05:03 2010
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-simal.version=0.2.4
+simal.version=0.2.4-rc1
simal.test=false
#simal.repository.dir=[the directory in which to store the simal
repository, defaults to user.dir]
simal.repository.filename=simal
=======================================
--- /branches/0.2.4/uk.ac.osswatch.simal.rest/pom.xml Fri Jun 11 11:04:19
2010
+++ /branches/0.2.4/uk.ac.osswatch.simal.rest/pom.xml Thu Jun 17 06:05:03
2010
@@ -5,7 +5,7 @@
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-rest</artifactId>
<packaging>jar</packaging>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
<name>Simal Rest API</name>
<url>http://simal.oss-watch.ac.uk/rest</url>
@@ -89,7 +89,7 @@
<dependency>
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-core</artifactId>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
</dependency>
<dependency>
=======================================
--- /branches/0.2.4/uk.ac.osswatch.simal.web/pom.xml Fri Jun 11 11:04:19
2010
+++ /branches/0.2.4/uk.ac.osswatch.simal.web/pom.xml Thu Jun 17 06:05:03
2010
@@ -6,7 +6,7 @@
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-webapp</artifactId>
<packaging>war</packaging>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
<name>Simal Web Application</name>
<url>http://simal.oss-watch.ac.uk/web</url>
<description>
@@ -114,13 +114,13 @@
<dependency>
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-core</artifactId>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
</dependency>
<dependency>
<groupId>uk.ac.osswatch</groupId>
<artifactId>simal-rest</artifactId>
- <version>0.2.4</version>
+ <version>0.2.4-rc1</version>
</dependency>
<dependency>
@@ -222,14 +222,12 @@
<directory>src/main/resources</directory>
</resource>
<resource>
- <filtering>false</filtering>
- <directory>src/main/gadgets</directory>
+ <filtering>true</filtering>
+ <directory>src/main/widgets</directory>
+ <targetPath>${project.build.directory}/filteredWidgets</targetPath>
<includes>
<include>**</include>
</includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
</resource>
<resource>
<filtering>false</filtering>
@@ -274,12 +272,12 @@
<version>1.3</version>
<executions>
<execution>
- <phase>package</phase>
+ <phase>package</phase>
<configuration>
<tasks>
<mkdir dir="${project.build.directory}/widgets"/>
- <zip
basedir="${project.basedir}/src/main/widgets/doapcreator"
-
destfile="${project.build.directory}/widgets/doapcreator.wgt">
+ <zip
basedir="${project.build.directory}/filteredWidgets/doapcreator"
+
destfile="${project.build.directory}/widgets/doapcreator-${project.version}.wgt">
</zip>
</tasks>
</configuration>
=======================================
---
/branches/0.2.4/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/config.xml
Fri Jun 11 10:53:24 2010
+++
/branches/0.2.4/uk.ac.osswatch.simal.web/src/main/widgets/doapcreator/config.xml
Thu Jun 17 06:05:03 2010
@@ -18,7 +18,7 @@
<widget xmlns="http://www.w3.org/ns/widgets";
id="http://wookie.apache.org/widgets/doapcreator";
- version="0.1"
+ version="${project.version}"
width="750"
height="400"
>
--
You received this message because you are subscribed to the Google Groups "Simal
Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simal-commits?hl=en.
