Skip to content

Commit

Permalink
Updated versions to 0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
quintesse committed Oct 31, 2012
1 parent d59f517 commit 496c432
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion api/src/main/resources/module.xml
Expand Up @@ -29,6 +29,6 @@


<dependencies> <dependencies>
<module name="ceylon.modules.spi"/> <module name="ceylon.modules.spi"/>
<module name="ceylon.language" slot="0.4"/> <module name="ceylon.language" slot="0.5"/>
</dependencies> </dependencies>
</module> </module>
Expand Up @@ -21,6 +21,7 @@
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;


import com.redhat.ceylon.common.Versions;
import com.redhat.ceylon.common.tool.Argument; import com.redhat.ceylon.common.tool.Argument;
import com.redhat.ceylon.common.tool.Description; import com.redhat.ceylon.common.tool.Description;
import com.redhat.ceylon.common.tool.Option; import com.redhat.ceylon.common.tool.Option;
Expand Down Expand Up @@ -110,7 +111,7 @@ public void run() {


argList.addAll(Arrays.asList(new String[]{ argList.addAll(Arrays.asList(new String[]{
"-mp", sysRep, "-mp", sysRep,
"ceylon.runtime:0.4", "ceylon.runtime:" + Versions.CEYLON_VERSION_NUMBER,
"+executable", "ceylon.modules.jboss.runtime.JBossRuntime"})); "+executable", "ceylon.modules.jboss.runtime.JBossRuntime"}));


if (run != null) { if (run != null) {
Expand Down
Expand Up @@ -23,6 +23,8 @@
import org.jboss.modules.ModuleLoader; import org.jboss.modules.ModuleLoader;
import org.jboss.modules.ModuleSpec; import org.jboss.modules.ModuleSpec;


import com.redhat.ceylon.common.Versions;

import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
Expand All @@ -39,7 +41,7 @@
*/ */
public class RemoteModuleLoader extends BootstrapModuleLoader { public class RemoteModuleLoader extends BootstrapModuleLoader {


private final static String DEFAULT_CEYLON_VERSION = "0.4"; private final static String DEFAULT_CEYLON_VERSION = Versions.CEYLON_VERSION_NUMBER;
private final static String INDEX = ".index"; private final static String INDEX = ".index";
private final static String XML = "module.xml"; private final static String XML = "module.xml";


Expand Down
8 changes: 4 additions & 4 deletions build.properties
@@ -1,8 +1,8 @@
# ----- Version Control Flags ----- # ----- Version Control Flags -----
module.ceylon.runtime.version=0.4 module.ceylon.runtime.version=0.5
module.com.redhat.ceylon.common.version=0.4 module.com.redhat.ceylon.common.version=0.5
module.ceylon.language.version=0.4 module.ceylon.language.version=0.5
module.com.redhat.ceylon.module-resolver.version=0.4 module.com.redhat.ceylon.module-resolver.version=0.5
module.com.redhat.ceylon.maven-support.version=main module.com.redhat.ceylon.maven-support.version=main


base.path=${basedir}/lib base.path=${basedir}/lib
Expand Down
Expand Up @@ -22,9 +22,9 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->


<module xmlns="urn:jboss:module:1.0" name="ceylon.language" slot="0.4"> <module xmlns="urn:jboss:module:1.0" name="ceylon.language" slot="0.5">
<resources> <resources>
<resource-root path="ceylon.language-0.4.car"/> <resource-root path="ceylon.language-0.5.car"/>
</resources> </resources>


<dependencies> <dependencies>
Expand Down
Expand Up @@ -22,17 +22,17 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->


<module xmlns="urn:jboss:module:1.0" name="ceylon.runtime" slot="0.4"> <module xmlns="urn:jboss:module:1.0" name="ceylon.runtime" slot="0.5">
<resources> <resources>
<resource-root path="ceylon.runtime-0.4.jar"/> <resource-root path="ceylon.runtime-0.5.jar"/>
</resources> </resources>


<main-class name="ceylon.modules.Main"/> <main-class name="ceylon.modules.Main"/>


<dependencies> <dependencies>
<module name="ceylon.language" slot="0.4"/> <module name="ceylon.language" slot="0.5"/>
<module name="com.redhat.ceylon.common" slot="0.4"/> <module name="com.redhat.ceylon.common" slot="0.5"/>
<module name="com.redhat.ceylon.module-resolver" slot="0.4"/> <module name="com.redhat.ceylon.module-resolver" slot="0.5"/>
<module name="com.redhat.ceylon.maven-support" services="import" optional="true"/> <module name="com.redhat.ceylon.maven-support" services="import" optional="true"/>
<module name="org.jboss.modules"/> <module name="org.jboss.modules"/>
</dependencies> </dependencies>
Expand Down
Expand Up @@ -22,8 +22,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->


<module xmlns="urn:jboss:module:1.0" name="com.redhat.ceylon.common" slot="0.4"> <module xmlns="urn:jboss:module:1.0" name="com.redhat.ceylon.common" slot="0.5">
<resources> <resources>
<resource-root path="com.redhat.ceylon.common-0.4.jar"/> <resource-root path="com.redhat.ceylon.common-0.5.jar"/>
</resources> </resources>
</module> </module>
Expand Up @@ -22,13 +22,13 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->


<module xmlns="urn:jboss:module:1.0" name="com.redhat.ceylon.module-resolver" slot="0.4"> <module xmlns="urn:jboss:module:1.0" name="com.redhat.ceylon.module-resolver" slot="0.5">
<resources> <resources>
<resource-root path="com.redhat.ceylon.module-resolver-0.4.jar"/> <resource-root path="com.redhat.ceylon.module-resolver-0.5.jar"/>
</resources> </resources>


<dependencies> <dependencies>
<module name="com.redhat.ceylon.common" slot="0.4"/> <module name="com.redhat.ceylon.common" slot="0.5"/>
<module name="org.jboss.jandex"/> <module name="org.jboss.jandex"/>
<module name="com.redhat.ceylon.maven-support" services="import" optional="true"/> <module name="com.redhat.ceylon.maven-support" services="import" optional="true"/>
</dependencies> </dependencies>
Expand Down
Expand Up @@ -32,6 +32,8 @@
import com.redhat.ceylon.cmr.api.ImportType; import com.redhat.ceylon.cmr.api.ImportType;
import com.redhat.ceylon.cmr.api.JDKUtils; import com.redhat.ceylon.cmr.api.JDKUtils;
import com.redhat.ceylon.cmr.api.RepositoryManager; import com.redhat.ceylon.cmr.api.RepositoryManager;
import com.redhat.ceylon.common.Versions;

import org.jboss.modules.DependencySpec; import org.jboss.modules.DependencySpec;
import org.jboss.modules.LocalLoader; import org.jboss.modules.LocalLoader;
import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleIdentifier;
Expand Down Expand Up @@ -61,7 +63,7 @@ public class CeylonModuleLoader extends ModuleLoader {
private static final Set<ModuleIdentifier> BOOTSTRAP; private static final Set<ModuleIdentifier> BOOTSTRAP;


static { static {
final String defaultVersion = System.getProperty("ceylon.version", "0.4"); final String defaultVersion = System.getProperty("ceylon.version", Versions.CEYLON_VERSION_NUMBER);
LANGUAGE = ModuleIdentifier.create("ceylon.language", defaultVersion); LANGUAGE = ModuleIdentifier.create("ceylon.language", defaultVersion);
COMMON = ModuleIdentifier.create("com.redhat.ceylon.common", defaultVersion); COMMON = ModuleIdentifier.create("com.redhat.ceylon.common", defaultVersion);
CMR = ModuleIdentifier.create("com.redhat.ceylon.module-resolver", defaultVersion); CMR = ModuleIdentifier.create("com.redhat.ceylon.module-resolver", defaultVersion);
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/module.xml
Expand Up @@ -31,6 +31,6 @@


<dependencies> <dependencies>
<module name="ceylon.modules.api"/> <module name="ceylon.modules.api"/>
<module name="ceylon.language" slot="0.4"/> <module name="ceylon.language" slot="0.5"/>
</dependencies> </dependencies>
</module> </module>
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -30,8 +30,8 @@
</organization> </organization>


<properties> <properties>
<version.com.redhat.ceylon.language>0.4</version.com.redhat.ceylon.language> <version.com.redhat.ceylon.language>0.5</version.com.redhat.ceylon.language>
<version.com.redhat.ceylon.common>0.4</version.com.redhat.ceylon.common> <version.com.redhat.ceylon.common>0.5</version.com.redhat.ceylon.common>
<version.com.redhat.ceylon.cmr>1.0.0-SNAPSHOT</version.com.redhat.ceylon.cmr> <version.com.redhat.ceylon.cmr>1.0.0-SNAPSHOT</version.com.redhat.ceylon.cmr>
<version.org.jboss.modules>1.1.3.GA</version.org.jboss.modules> <version.org.jboss.modules>1.1.3.GA</version.org.jboss.modules>
<version.org.jboss.shrinkwrap>1.1.0</version.org.jboss.shrinkwrap> <version.org.jboss.shrinkwrap>1.1.0</version.org.jboss.shrinkwrap>
Expand Down

0 comments on commit 496c432

Please sign in to comment.