Skip to content

Commit

Permalink
follow changed versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkristian
mkristian committed Jul 3, 2011
1 parent decbe0d commit 7fd7271
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 152 deletions.
4 changes: 2 additions & 2 deletions demo/Gemfile
View file
@@ -1,14 +1,14 @@
source 'http://rubygems.org'

RAILS_VERSION = '3.0.9'
DM_VERSION = '~> 1.0.0'
DM_VERSION = '~> 1.1.0'

gem 'activesupport', RAILS_VERSION, :require => 'active_support'
gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
gem 'actionmailer', RAILS_VERSION, :require => 'action_mailer'
gem 'railties', RAILS_VERSION, :require => 'rails'

gem 'dm-rails', '~> 1.0.0'
gem 'dm-rails', DM_VERSION
#gem 'dm-sqlite-adapter', DM_VERSION

# You can use any of the other available database adapters.
Expand Down
98 changes: 48 additions & 50 deletions demo/Gemfile.lock
View file
Expand Up @@ -21,51 +21,49 @@ GEM
i18n (~> 0.5.0)
activesupport (3.0.9)
addressable (2.2.6)
bcrypt-ruby (2.1.4-java)
builder (2.1.2)
dm-active_model (1.0.3)
activemodel (~> 3.0.0)
dm-core (~> 1.0.2)
dm-aggregates (1.0.2)
dm-core (~> 1.0.2)
dm-constraints (1.0.2)
dm-core (~> 1.0.2)
dm-migrations (~> 1.0.2)
dm-core (1.0.2)
addressable (~> 2.2)
extlib (~> 0.9.15)
dm-active_model (1.1.0)
activemodel (~> 3.0.4)
dm-core (~> 1.1.0)
dm-aggregates (1.1.0)
dm-core (~> 1.1.0)
dm-constraints (1.1.0)
dm-core (~> 1.1.0)
dm-core (1.1.0)
addressable (~> 2.2.4)
dm-hibernate-adapter (0.1-java)
dm-core (>= 1.0.0, < 1.0.99999)
dm-migrations (>= 1.0.0, < 1.0.99999)
dm-transactions (>= 1.0.0, < 1.0.99999)
dm-core (>= 1.1.0, < 1.1.99999)
dm-migrations (>= 1.1.0, < 1.1.99999)
dm-transactions (>= 1.1.0, < 1.1.99999)
slf4r (= 0.3.1)
dm-migrations (1.0.2)
dm-core (~> 1.0.2)
dm-observer (1.0.2)
dm-core (~> 1.0.2)
dm-rails (1.0.4)
actionpack (~> 3.0.0)
activesupport (~> 3.0.0)
dm-active_model (~> 1.0.3)
dm-core (~> 1.0.0)
railties (~> 3.0.0)
dm-timestamps (1.0.2)
dm-core (~> 1.0.2)
dm-transactions (1.0.2)
dm-core (~> 1.0.2)
dm-types (1.0.2)
dm-core (~> 1.0.2)
fastercsv (~> 1.5.3)
json_pure (~> 1.4)
stringex (~> 1.1.0)
uuidtools (~> 2.1.1)
dm-validations (1.0.2)
dm-core (~> 1.0.2)
dm-migrations (1.1.0)
dm-core (~> 1.1.0)
dm-observer (1.1.0)
dm-core (~> 1.1.0)
dm-rails (1.1.0)
actionpack (~> 3.0.4)
dm-active_model (~> 1.1.0)
dm-core (~> 1.1.0)
railties (~> 3.0.4)
dm-timestamps (1.1.0)
dm-core (~> 1.1.0)
dm-transactions (1.1.0)
dm-core (~> 1.1.0)
dm-types (1.1.0)
bcrypt-ruby (~> 2.1.4)
dm-core (~> 1.1.0)
fastercsv (~> 1.5.4)
json (~> 1.4.6)
stringex (~> 1.2.0)
uuidtools (~> 2.1.2)
dm-validations (1.1.0)
dm-core (~> 1.1.0)
erubis (2.6.6)
abstract (>= 1.0.0)
extlib (0.9.15)
fastercsv (1.5.4)
i18n (0.5.0)
json_pure (1.5.3)
json (1.4.6-java)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
Expand All @@ -85,13 +83,13 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.6.1)
rdoc (3.8)
slf4r (0.3.1)
stringex (1.1.0)
stringex (1.2.1)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.28)
tzinfo (0.3.29)
uuidtools (2.1.2)

PLATFORMS
Expand All @@ -101,14 +99,14 @@ DEPENDENCIES
actionmailer (= 3.0.9)
actionpack (= 3.0.9)
activesupport (= 3.0.9)
dm-aggregates (~> 1.0.0)
dm-constraints (~> 1.0.0)
dm-aggregates (~> 1.1.0)
dm-constraints (~> 1.1.0)
dm-hibernate-adapter
dm-migrations (~> 1.0.0)
dm-observer (~> 1.0.0)
dm-rails (~> 1.0.0)
dm-timestamps (~> 1.0.0)
dm-transactions (~> 1.0.0)
dm-types (~> 1.0.0)
dm-validations (~> 1.0.0)
dm-migrations (~> 1.1.0)
dm-observer (~> 1.1.0)
dm-rails (~> 1.1.0)
dm-timestamps (~> 1.1.0)
dm-transactions (~> 1.1.0)
dm-types (~> 1.1.0)
dm-validations (~> 1.1.0)
railties (= 3.0.9)
56 changes: 28 additions & 28 deletions demo/Gemfile.pom
View file
Expand Up @@ -140,17 +140,17 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>extlib</artifactId>
<artifactId>dm-migrations</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-migrations</artifactId>
<artifactId>dm-types</artifactId>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-types</artifactId>
<artifactId>bcrypt-ruby</artifactId>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -160,7 +160,7 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json_pure</artifactId>
<artifactId>json</artifactId>
<type>gem</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -321,7 +321,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>tzinfo</artifactId>
<version>0.3.28</version>
<version>0.3.29</version>
<type>gem</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -356,50 +356,50 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-active_model</artifactId>
<version>1.0.3</version>
<artifactId>bcrypt-ruby</artifactId>
<version>2.1.4</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-core</artifactId>
<version>1.0.2</version>
<artifactId>dm-active_model</artifactId>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>extlib</artifactId>
<version>0.9.15</version>
<artifactId>dm-core</artifactId>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-aggregates</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-constraints</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-migrations</artifactId>
<version>1.0.2</version>
<artifactId>dm-hibernate-adapter</artifactId>
<version>0.1</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-hibernate-adapter</artifactId>
<version>0.1</version>
<artifactId>dm-migrations</artifactId>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-transactions</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -411,13 +411,13 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-observer</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-rails</artifactId>
<version>1.0.4</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -435,7 +435,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>rdoc</artifactId>
<version>3.6.1</version>
<version>3.8</version>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -447,13 +447,13 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-timestamps</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-types</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -464,14 +464,14 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json_pure</artifactId>
<version>1.5.3</version>
<artifactId>json</artifactId>
<version>1.4.6</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>stringex</artifactId>
<version>1.1.0</version>
<version>1.2.1</version>
<type>gem</type>
</dependency>
<dependency>
Expand All @@ -483,7 +483,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>dm-validations</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
<type>gem</type>
</dependency>
</dependencies>
Expand All @@ -492,7 +492,7 @@
<gem.home>${project.build.directory}/rubygems</gem.home>
<gem.path>${project.build.directory}/rubygems</gem.path>
<jetty.version>7.4.2.v20110526</jetty.version>
<jruby.plugins.version>0.28.2</jruby.plugins.version>
<jruby.plugins.version>0.28.3</jruby.plugins.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rails.env>development</rails.env>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions demo/Mavenfile
View file
@@ -1,14 +1,14 @@
# -*- mode: ruby -*-
#jar 'mysql:mysql-connector-java', '5.1.9'
#jar 'postgresql:postgresql', '8.4-701.jdbc4'
jar 'com.h2database:h2', '1.2.138'
#jar 'org.apache.derby:derby' ,'10.5.3.0_1'
#jar 'org.hsqldb:hsqldb', '2.0.0'
jar 'com.h2database:h2', '1.2.138'

jar 'org.slf4j:slf4j-log4j12', '1.5.2'
jar 'log4j:log4j', '1.2.14'

properties['jruby.plugins.version'] = '0.28.2'
properties['jruby.plugins.version'] = '0.28.3'

execute_in_phase(:initialize) do
require 'fileutils'
Expand Down
Binary file modified demo/db/demo.h2.db
View file
Binary file not shown.

0 comments on commit 7fd7271

Please sign in to comment.