[jboss-cvs] JBossAS SVN: r92441 - in trunk/main: src and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 16:16:48 EDT 2009
Author: pgier
Date: 2009-08-17 16:16:47 -0400 (Mon, 17 Aug 2009)
New Revision: 92441
Removed:
trunk/main/src/etc/
Modified:
trunk/main/pom.xml
trunk/main/src/assembly/run.xml
trunk/main/src/resources/org/jboss/version.properties
Log:
[JBBUILD-538] Remove main dependency on buildmagic version.properties.
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2009-08-17 20:11:58 UTC (rev 92440)
+++ trunk/main/pom.xml 2009-08-17 20:16:47 UTC (rev 92441)
@@ -16,8 +16,28 @@
<build>
<finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <!-- This makes available properties containing version components (major, minor, etc) -->
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -54,52 +74,6 @@
<configuration>
<tasks>
- <tstamp>
- <format property="build.number" pattern="yyyyMMddHHmm"/>
- <format property="YEAR" pattern="yyyy"/>
- </tstamp>
- <property name="build.id" value="${build.number}"/>
-
- <property file="../tools/etc/buildmagic/version.properties"/>
-
- <filter filtersfile="../tools/etc/buildmagic/version.properties"/>
- <filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
- <filter token="build.number" value="${build.number}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="DSTAMP" value="${DSTAMP}"/>
- <filter token="TSTAMP" value="${TSTAMP}"/>
- <filter token="TODAY" value="${TODAY}"/>
-
- <filter token="java.version" value="${java.version}"/>
- <filter token="java.vendor" value="${java.vendor}"/>
- <filter token="java.vm.specification.version" value="${java.vm.specification.version}"/>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.name" value="${java.vm.name}"/>
- <filter token="java.vm.info" value="${java.vm.info}"/>
- <filter token="java.specification.version" value="${java.specification.version}"/>
- <filter token="java.class.version" value="${java.class.version}"/>
-
- <filter token="os.name" value="${os.name}"/>
- <filter token="os.arch" value="${os.arch}"/>
- <filter token="os.version" value="${os.version}"/>
-
- <mkdir dir="target/etc"/>
- <copy todir="target/etc" filtering="yes">
- <fileset dir="src/etc">
- </fileset>
- </copy>
-
- <mkdir dir="target/resources"/>
- <copy todir="target/resources" filtering="yes">
- <fileset dir="src/resources">
- </fileset>
- </copy>
-
- <jar destfile="target/jboss-as-main-run.jar"
- basedir="target/resources"
- includes="org/jboss/version.properties"
- update="true"/>
-
<mkdir dir="target/bin"/>
<copy todir="target/bin" filtering="yes">
<fileset dir="src/bin">
Modified: trunk/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml 2009-08-17 20:11:58 UTC (rev 92440)
+++ trunk/main/src/assembly/run.xml 2009-08-17 20:16:47 UTC (rev 92441)
@@ -9,19 +9,10 @@
<directory>target/classes</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>*.properties</include>
<include>org/jboss/**</include>
</includes>
</fileSet>
- <fileSet>
- <directory>src/resources</directory>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>*.properties</include>
- <include>jdklogger.xml</include>
- <!--<include>org/jboss/version.properties</include>-->
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: trunk/main/src/resources/org/jboss/version.properties
===================================================================
--- trunk/main/src/resources/org/jboss/version.properties 2009-08-17 20:11:58 UTC (rev 92440)
+++ trunk/main/src/resources/org/jboss/version.properties 2009-08-17 20:16:47 UTC (rev 92441)
@@ -7,31 +7,31 @@
### $Id$ ###
# The version of the server
-version.major=@version.major@
-version.minor=@version.minor@
-version.revision=@version.revision@
-version.tag=@version.tag@
-version.name=@version.name@
-version.cvstag=@version.cvstag@
+version.major=${parsedVersion.majorVersion}
+version.minor=${parsedVersion.minorVersion}
+version.revision=${parsedVersion.incrementalVersion}
+version.tag=${parsedVersion.qualifier}
+version.name=${project.version.name}
+version.cvstag=JBoss_${project.version}
# Build identifiers
-build.number=@build.number@
-build.id=@build.id@
-build.date=@DSTAMP@
-build.time=@TSTAMP@
-build.day=@TODAY@
+build.number=r${buildNumber}
+build.id=r${buildNumber}
+build.date=${timestamp}
+build.time=${timestamp}
+build.day=${timestamp}
# Information about Java version used to compile
-java.version=@java.version@
-java.vendor=@java.vendor@
-java.vm.specification.version=@java.vm.specification.version@
-java.vm.version=@java.vm.version@
-java.vm.name=@java.vm.name@
-java.vm.info=@java.vm.info@
-java.specification.version=@java.specification.version@
-java.class.version=@java.class.version@
+java.version=${java.version}
+java.vendor=${java.vendor}
+java.vm.specification.version=${java.vm.specification.version}
+java.vm.version=${java.vm.version}
+java.vm.name=${java.vm.name}
+java.vm.info=${java.vm.info}
+java.specification.version=${java.specification.version}
+java.class.version=${java.class.version}
# Information about the OS the server was compiled on
-os.name=@os.name@
-os.arch=@os.arch@
-os.version=@os.version@
+os.name=${os.name}
+os.arch=${os.arch}
+os.version=${os.version}
More information about the jboss-cvs-commits
mailing list