Skip to content

Commit

Permalink
[build] fix merge failure and new generation of pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed May 13, 2015
1 parent 54e28cd commit 843129c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion core/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
jar 'com.github.jnr:jnr-enxio:0.9'
jar 'com.github.jnr:jnr-x86asm:1.0.2'
jar 'com.github.jnr:jnr-unixsocket:0.8'
jar 'com.github.jnr:jnr-posix:3.0.12'
jar 'com.github.jnr:jnr-posix:3.0.13-SNAPSHOT'
jar 'com.github.jnr:jnr-constants:0.8.7'
jar 'com.github.jnr:jnr-ffi:2.0.3'
jar 'com.github.jnr:jffi:${jffi.version}'
Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
<version.ruby>2.2.2</version.ruby>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<pkg.dir>${build.dir}/pkg</pkg.dir>
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
<spec.dir>spec</spec.dir>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<tesla.dump.readonly>true</tesla.dump.readonly>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>2</version.ruby.minor>
<tzdata.version>2013d</tzdata.version>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<dest.lib.dir>${lib.dir}</dest.lib.dir>
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
<build.dir>target</build.dir>
Expand All @@ -37,7 +38,6 @@
<release.dir>release</release.dir>
<lib.dir>lib</lib.dir>
<rails.dir>${test.dir}/rails</rails.dir>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
Expand Down Expand Up @@ -110,7 +110,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-constants</artifactId>
<version>0.8.8-SNAPSHOT</version>
<version>0.8.7</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand Down
17 changes: 8 additions & 9 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
<properties>
<tesla.dump.readonly>true</tesla.dump.readonly>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
<gem.home>${basedir}/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.0.9</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
<tesla.version>0.1.1</tesla.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -254,9 +253,9 @@
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.1.9</version>
<executions>
<execution>
<id>install_gems</id>
Expand Down Expand Up @@ -305,9 +304,9 @@
</executions>
<dependencies>
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.9</version>
</dependency>
</dependencies>
</plugin>
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
</site>
</distributionManagement>
<properties>
<tesla.version>0.1.1</tesla.version>
<rspec-core.version>2.14.2</rspec-core.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.4.1</minitest.version>
Expand All @@ -129,9 +129,7 @@
<test-unit.version>3.0.3</test-unit.version>
<rdoc.version>4.1.0</rdoc.version>
<rspec.version>2.14.1</rspec.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<base.java.version>1.7</base.java.version>
<tesla.dump.readonly>true</tesla.dump.readonly>
<rspec-mocks.version>2.14.1</rspec-mocks.version>
<jruby.plugins.version>1.0.9</jruby.plugins.version>
<json.version>1.8.0</json.version>
Expand All @@ -142,6 +140,7 @@
<main.basedir>${project.basedir}</main.basedir>
<github.global.server>github</github.global.server>
<joda.time.version>2.5</joda.time.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions truffle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<name>JRuby Truffle</name>
<properties>
<jruby.basedir>${basedir}/..</jruby.basedir>
<tesla.dump.readonly>true</tesla.dump.readonly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
</properties>
<dependencies>
<dependency>
Expand Down

0 comments on commit 843129c

Please sign in to comment.